diff --git a/CHANGELOG.md b/CHANGELOG.md
index 043f9c21..7526e653 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Calibration breaking when zoomed out and switch to calibrate to recalibrate.
+
 ## [1.3.0] - 2025-06-25
 
 ### Added
diff --git a/app/_components/draggable.tsx b/app/_components/draggable.tsx
index 9834fbb2..fa791610 100644
--- a/app/_components/draggable.tsx
+++ b/app/_components/draggable.tsx
@@ -226,6 +226,26 @@ export default function Draggable({
     setPerspective,
   ]);
 
+  useEffect(() => {
+    if (isCalibrating && restoreTransforms !== null) {
+      transformer.setLocalTransform(restoreTransforms.localTransform);
+      setCalibrationTransform(restoreTransforms.calibrationTransform);
+      setPerspective(inverse(restoreTransforms.calibrationTransform));
+      setRestoreTransforms(null);
+      setZoomedOut(false);
+      setMagnifying(false);
+    }
+  }, [
+    isCalibrating,
+    restoreTransforms,
+    transformer,
+    setCalibrationTransform,
+    setPerspective,
+    setRestoreTransforms,
+    setZoomedOut,
+    setMagnifying,
+  ]);
+
   let cursorMode = "cursor-grab";
 
   if (zoomedOut || magnifying) {