diff --git a/src/main/java/dev/isxander/controlify/gui/screen/ControllerCalibrationScreen.java b/src/main/java/dev/isxander/controlify/gui/screen/ControllerCalibrationScreen.java
index 98a6def..bedcdbc 100644
--- a/src/main/java/dev/isxander/controlify/gui/screen/ControllerCalibrationScreen.java
+++ b/src/main/java/dev/isxander/controlify/gui/screen/ControllerCalibrationScreen.java
@@ -196,9 +196,12 @@ public class ControllerCalibrationScreen extends Screen {
 
     private void onLaterButtonPress() {
         if (!calibrated) {
-            controller.config().delayedCalibration = true;
-            Controlify.instance().config().setDirty();
-            Controlify.instance().setCurrentController(null);
+            if (!controller.config().deadzonesCalibrated) {
+                controller.config().delayedCalibration = true;
+                Controlify.instance().config().setDirty();
+                Controlify.instance().setCurrentController(null);
+            }
+
             onClose();
         }
     }