diff --git a/Assets/Engine/Runtime/Modules/PuzzleState.cs b/Assets/Engine/Runtime/Modules/PuzzleState.cs
index 09fc49e..1a91254 100644
--- a/Assets/Engine/Runtime/Modules/PuzzleState.cs
+++ b/Assets/Engine/Runtime/Modules/PuzzleState.cs
@@ -54,14 +54,6 @@ namespace EscapeRoomEngine.Engine.Runtime.Modules
         protected virtual void Start()
         {
             OnPuzzleEvent(PuzzleEventType.Restarted);
-
-            PuzzleEvent += (_, type) =>
-            {
-                if (type == PuzzleEventType.Solved)
-                {
-                    Measure.Solve((PuzzleModuleDescription)Module.description);
-                }
-            };
         }
 
         private void OnPuzzleEvent(PuzzleEventType type)
diff --git a/Assets/Engine/Runtime/Room.cs b/Assets/Engine/Runtime/Room.cs
index 6b8c543..784a650 100644
--- a/Assets/Engine/Runtime/Room.cs
+++ b/Assets/Engine/Runtime/Room.cs
@@ -59,6 +59,8 @@ namespace EscapeRoomEngine.Engine.Runtime
         {
             if (type == PuzzleEventType.Solved)
             {
+                Measure.Solve((PuzzleModuleDescription)puzzle.description);
+                
                 if (LastRoom)
                 {
                     GameControl.Instance.StopGame();