diff --git a/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java b/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java
index c68b14835..c85b820dc 100644
--- a/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java
@@ -192,9 +192,10 @@ public class RequestHandler {
                 System.err.println("CALFAIL");
                 ctx.status(500);
             }
+        } else {
+            pipeManager.setCalibrationMode(false);
+            ctx.status(201);
         }
-        pipeManager.setCalibrationMode(false);
-        ctx.status(201);
     }
 
     public static void onPnpModel(Context ctx) throws JsonProcessingException {