diff --git a/src/components/pages/uniformity/form/UniformityForm.tsx b/src/components/pages/uniformity/form/UniformityForm.tsx
index 40e4fa22..10e8fda0 100644
--- a/src/components/pages/uniformity/form/UniformityForm.tsx
+++ b/src/components/pages/uniformity/form/UniformityForm.tsx
@@ -389,6 +389,9 @@ const UniformityForm = ({
       unsub();
       useUiStore.getState().setExpandedDrawerOpen(false);
       useUiStore.getState().setExpandedDrawerContent(null);
+      useUiStore.getState().setIsNextStep(false);
+      useUniformityStore.getState().setUniformityStep('preview');
+      useUniformityStore.getState().setVerifyUniformityResult(null);
     };
   }, [subscribeValidate, setIsValid]);
 
@@ -401,8 +404,18 @@ const UniformityForm = ({
       }
     } else {
       setExpandedDrawerContent(null);
+      setIsNextStep(false);
+      setUniformityStep('preview');
+      setVerifyUniformityResult(null);
     }
-  }, [expandedDrawerOpen, uniformityStep, setExpandedDrawerContent]);
+  }, [
+    expandedDrawerOpen,
+    uniformityStep,
+    setExpandedDrawerContent,
+    setIsNextStep,
+    setUniformityStep,
+    setVerifyUniformityResult,
+  ]);
 
   return (
     <>