diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43556930c..f0adc1de0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@ All notable changes to this project will be documented in this file.
 - Berry `math.inf`, `math.isinf()` and fixed json ouput for `inf` and `nan` (#21304)
 - Compilation of Ethernet when SPI drivers are disabled (#21321)
 - Conflicting log_level definitions in NimBLE (#21337)
+- Avoid unwanted OTA upgrade when safeboot starts for the first time
 
 ### Removed
 - LVGL disabled vector graphics (#21242)
diff --git a/tasmota/tasmota_support/support_esp32.ino b/tasmota/tasmota_support/support_esp32.ino
index b7065bf63..14a2b5bad 100644
--- a/tasmota/tasmota_support/support_esp32.ino
+++ b/tasmota/tasmota_support/support_esp32.ino
@@ -177,7 +177,7 @@ void QPCWrite(const void *pSettings, unsigned nSettingsLen) {
 }
 
 bool OtaFactoryRead(void) {
-  uint32_t pOtaLoader;
+  uint32_t pOtaLoader = 0;
   NvmLoad("otal", "otal", &pOtaLoader, sizeof(pOtaLoader));
   return pOtaLoader;
 }