diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index bd3312cac..575621071 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -303,6 +303,11 @@ void EmergencyReset(void) {
     }
   }
   while (Serial.available()) { Serial.read(); }  // Flush input buffer
+#ifdef ESP32
+  delay(10);                  // Allow time to cleanup queues - if not used hangs ESP32
+  Serial.end();
+  delay(10);                  // Allow time to cleanup queues - if not used hangs ESP32
+#endif  // ESP32
 }
 #endif  // USE_EMERGENCY_RESET