diff --git a/src/MainTask.h b/src/MainTask.h
index 9b69e24..f592927 100644
--- a/src/MainTask.h
+++ b/src/MainTask.h
@@ -246,7 +246,7 @@ protected:
 
       } else if (!this->emergencyDetected && vars.states.emergency) {
         // disable emergency
-        if (millis() - this->emergencyFlipTime > 30000) {
+        if (millis() - this->emergencyFlipTime > (settings.emergency.tresholdTime * 1000)) {
           vars.states.emergency = false;
           Log.sinfoln(FPSTR(L_MAIN), F("Emergency mode disabled"));
         }