diff --git a/Assets/_DDD/_Scripts/GameState/GameState.cs b/Assets/_DDD/_Scripts/GameState/GameState.cs
index 69e1ad901..1a78fa8c5 100644
--- a/Assets/_DDD/_Scripts/GameState/GameState.cs
+++ b/Assets/_DDD/_Scripts/GameState/GameState.cs
@@ -10,5 +10,11 @@ private void OnEnable()
             LevelState = CreateInstance<GameLevelState>();
             UiState =  CreateInstance<UiState>();
         }
+
+        private void OnDisable()
+        {
+            if (LevelState) DestroyImmediate(LevelState);
+            if (UiState) DestroyImmediate(UiState);
+        }
     }
 }
\ No newline at end of file
diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Cook.cs b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Cook.cs
index 4cdc8b8b0..7f0983533 100644
--- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Cook.cs
+++ b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Cook.cs
@@ -11,8 +11,8 @@ public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable in
             var cookwareTypePayload = targetPayloadSo as CookwareTypePayload;
                 
             var evt = GameEvents.OpenPopupUiEvent;
-            //evt.UiType = typeof(CookUi);
-            //evt.Payload = cookwareTypePayload.CookwareType;
+            evt.UiType = typeof(CookUi);
+            evt.Payload = cookwareTypePayload.CookwareType;
             EventBus.Broadcast(evt);
             return true;
         }
diff --git a/Assets/_DDD/_Scripts/RestaurantState/RestaurantState.cs b/Assets/_DDD/_Scripts/RestaurantState/RestaurantState.cs
index 9370ee616..1855bd5eb 100644
--- a/Assets/_DDD/_Scripts/RestaurantState/RestaurantState.cs
+++ b/Assets/_DDD/_Scripts/RestaurantState/RestaurantState.cs
@@ -1,5 +1,3 @@
-using UnityEngine;
-
 namespace DDD
 {
     public class RestaurantState : ScriptSingleton<RestaurantState>
@@ -18,5 +16,14 @@ private void OnEnable()
             PlayerState = CreateInstance<RestaurantPlayerState>();
             CustomerState = CreateInstance<RestaurantCustomerState>();
         }
+        
+        private void OnDisable()
+        {
+            if (ManagementState) DestroyImmediate(ManagementState);
+            if (RunState) DestroyImmediate(RunState);
+            if (EnvironmentState) DestroyImmediate(EnvironmentState);
+            if (PlayerState) DestroyImmediate(PlayerState);
+            if (CustomerState) DestroyImmediate(CustomerState);
+        }
     }
 }
\ No newline at end of file