diff --git a/src/figma-make/components/pages/master-data/activity/MasterAktivitasContent.tsx b/src/figma-make/components/pages/master-data/activity/MasterAktivitasContent.tsx
index 36774ce2..b71edd47 100644
--- a/src/figma-make/components/pages/master-data/activity/MasterAktivitasContent.tsx
+++ b/src/figma-make/components/pages/master-data/activity/MasterAktivitasContent.tsx
@@ -147,10 +147,6 @@ export function MasterAktivitasContent() {
     time_type: 'umum',
   });
 
-  useEffect(() => {
-    setInitialLoading(false);
-  }, []);
-
   // Phase handlers
   const handleAddPhase = () => {
     if (!selectedCategory) {
@@ -423,6 +419,14 @@ export function MasterAktivitasContent() {
     }
   };
 
+  useEffect(() => {
+    setInitialLoading(false);
+  }, []);
+
+  useEffect(() => {
+    setSelectedPhase(null);
+  }, [selectedCategory]);
+
   if (initialLoading) {
     return (
       <div className='min-h-screen'>