diff --git a/main/safety.c b/main/safety.c
index 24ff2db..d490821 100644
--- a/main/safety.c
+++ b/main/safety.c
@@ -58,6 +58,12 @@ void taskSafety(void *pvParameters)
         {
 
             checkSensorSanity();
+
+            if (sSafetyState != SAFETY_NO_ERROR)
+            {
+                setSafeState();
+            }
+
             xSemaphoreGiveRecursive(xMutexAccessSafety);
         }
     }
@@ -122,8 +128,8 @@ void checkSensorSanity(void)
 
 void setSafeState(void)
 {
-    setCirculationPumpState(DISABLED);
-    setBurnerState(DISABLED);
+    setCirculationPumpState(ENABLED); // To cool down system
+    setBurnerState(DISABLED);         // Deactivate burner
 }
 
 void getSensorSanityStates(sSensorSanityCheck *pSensorSanityChecks)