diff --git a/Assets/Scripts/Minigames/DivingForPictures/PictureCamera/CameraViewfinderManager.cs b/Assets/Scripts/Minigames/DivingForPictures/PictureCamera/CameraViewfinderManager.cs
index b4bd819c..77be19dc 100644
--- a/Assets/Scripts/Minigames/DivingForPictures/PictureCamera/CameraViewfinderManager.cs
+++ b/Assets/Scripts/Minigames/DivingForPictures/PictureCamera/CameraViewfinderManager.cs
@@ -456,6 +456,8 @@ namespace Minigames.DivingForPictures.PictureCamera
         {
             if (viewfinderInstance != null)
             {
+                viewfinderComponent.RemoveInputOverride();
+                
                 // Unsubscribe from all viewfinder events
                 if (viewfinderComponent != null)
                 {
@@ -464,7 +466,7 @@ namespace Minigames.DivingForPictures.PictureCamera
                     viewfinderComponent.OnViewfinderHoldStarted -= HandleViewfinderHoldStarted;
                     viewfinderComponent.OnViewfinderHoldEnded -= HandleViewfinderHoldEnded;
                 }
-
+                
                 Destroy(viewfinderInstance);
                 viewfinderInstance = null;
                 viewfinderComponent = null;
@@ -785,7 +787,6 @@ namespace Minigames.DivingForPictures.PictureCamera
                 isReversePhase = false;
                 
                 // Hide the viewfinder on the second tap
-                viewfinderComponent.RemoveInputOverride();
                 HideViewfinder();
             }
             else
@@ -860,12 +861,6 @@ namespace Minigames.DivingForPictures.PictureCamera
                 OnAnimationCompleted?.Invoke();
                 isAnimating = false;
                 isReversePhase = false;
-                
-                // Hide the viewfinder
-                if (viewfinderComponent != null)
-                {
-                    viewfinderComponent.RemoveInputOverride();
-                }
                 HideViewfinder();
             }
         }