diff --git a/src/components/pages/uniformity/form/UniformityForm.tsx b/src/components/pages/uniformity/form/UniformityForm.tsx
index 7c8ba5d9..fab49ba5 100644
--- a/src/components/pages/uniformity/form/UniformityForm.tsx
+++ b/src/components/pages/uniformity/form/UniformityForm.tsx
@@ -345,8 +345,11 @@ const UniformityForm = ({
       setIsValid(true);
     });
 
-    return unsub;
-  }, []);
+    return () => {
+      unsub();
+      useUiStore.getState().setExpandedDrawerOpen(false);
+    };
+  }, [subscribeValidate, setIsValid]);
 
   // ===== EVENT HANDLERS =====
   const handleOpenExpandedDrawer = () => {
diff --git a/src/types/stores.d.ts b/src/types/stores.d.ts
index 5b4c7c6a..0521b40e 100644
--- a/src/types/stores.d.ts
+++ b/src/types/stores.d.ts
@@ -6,7 +6,7 @@ type MainUiSlice = {
 type DrawerUISlice = {
   triggerValidate: boolean;
   toggleValidate: () => void;
-  subscribeValidate: (callback: () => void) => void;
+  subscribeValidate: (callback: () => void) => () => void;
   isValid: boolean;
   setIsValid: (v: boolean) => void;
   subscribeIsValid: (callback: (isValid: boolean) => void) => () => void;