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 c85b820dc..e7bfe9192 100644
--- a/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java
@@ -193,9 +193,9 @@ public class RequestHandler {
                 ctx.status(500);
             }
         } else {
-            pipeManager.setCalibrationMode(false);
             ctx.status(201);
         }
+        pipeManager.setCalibrationMode(false);
     }
 
     public static void onPnpModel(Context ctx) throws JsonProcessingException {