diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 13971aceb..c21b7744c 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -409,6 +409,7 @@ void setup(void) {
   DisableBrownout();      // Workaround possible weak LDO resulting in brownout detection during Wifi connection
 #endif  // DISABLE_ESP32_BROWNOUT
 
+#ifndef FIRMWARE_SAFEBOOT
   // restore GPIO5/18 or 16/17 if no PSRAM is found which may be used by Ethernet among others
   if (!FoundPSRAM()) {
     // test if the CPU is not pico
@@ -420,6 +421,7 @@ void setup(void) {
       esp_gpio_revoke(BIT64(CONFIG_D0WD_PSRAM_CS_IO) | BIT64(CONFIG_D0WD_PSRAM_CLK_IO));
     }
   }
+#endif  // FIRMWARE_SAFEBOOT
 #endif  // CONFIG_IDF_TARGET_ESP32
 #endif  // ESP32