diff --git a/main.py b/main.py
index 596ffa1..5567006 100644
--- a/main.py
+++ b/main.py
@@ -276,7 +276,6 @@ def send_command(state: str, pu_number: int, ploop_setpoint: float = Query(...),
         raise HTTPException(status_code=400, detail=f"Invalid state '{state}'")
 
     logging.info(f"Sending state '{state}' to PU {pu_number}")
-    update_setpoints(ploop_setpoint, qperm_setpoint, pu_number)
 
     pu_number = [pu_number] if pu_number !=3 else [1,2] # Temporary way of starting two pus
 
@@ -292,8 +291,8 @@ def send_command(state: str, pu_number: int, ploop_setpoint: float = Query(...),
 
     try:
         for pu in pu_number:
-            # current_state = can_backend.read_current_state(pu)
-            # while current_state != state:
+            update_setpoints(ploop_setpoint, qperm_setpoint, pu)
+
             can_backend.send_state_command(state, pu, ploop_setpoint, qperm_setpoint)
             current_state = can_backend.read_current_state(pu)
 
diff --git a/templates/control.html b/templates/control.html
index 46fdf72..c1607a8 100644
--- a/templates/control.html
+++ b/templates/control.html
@@ -452,14 +452,15 @@
                 buttonEl.textContent = `PRODUCTION ON PU ${puNumber}`;
                 buttonEl.disabled = true;
             };
-            }
+        }
             else if (currentState === 'SYSTEM_MODE_PRODUCTION') {
                     // ✅ Directly update if already in production
                     buttonEl.classList.remove('in-progress');
                     buttonEl.classList.add('production');
                     buttonEl.textContent = `PRODUCTION ON PU ${puNumber}`;
                     buttonEl.disabled = true;
-                } else {
+                }
+            else {
                     setTimeout(checkReady, 1000);
                 }
             };