diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 254b526fc..d953811db 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -7439,7 +7439,7 @@ static void handleSafetyTimer()
 #if (EXTRUDERS > 1)
 #error Implemented only for one extruder.
 #endif //(EXTRUDERS > 1)
-    if ((PRINTER_ACTIVE) || (!degTargetBed() && !degTargetHotend(0)))
+    if ((PRINTER_ACTIVE) || (!degTargetBed() && !degTargetHotend(0)) || (!safetytimer_inactive_time))
     {
         safetyTimer.stop();
     }
diff --git a/Firmware/Timer.cpp b/Firmware/Timer.cpp
index 792c2ca88..ecf9b9b9d 100644
--- a/Firmware/Timer.cpp
+++ b/Firmware/Timer.cpp
@@ -43,7 +43,7 @@ void Timer<T>::start()
 template<typename T>
 bool Timer<T>::expired(T msPeriod)
 {
-    if ((!m_isRunning) || (!msPeriod)) return false;
+    if (!m_isRunning) return false;
     bool expired = false;
     const T now = millis();
     if (m_started <=  m_started + msPeriod)