diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fe47a47f..f36b48ae2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 - NeoPool NPBit and NPRead/NPReadL output
-
+- ESP32 PowerOnState (#15084)
 
 ## [11.0.0.3] 20220312
 ### Added
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index bdb4295c9..2a305c6fc 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -114,7 +114,8 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
 - TasmotaSerial implement ``end()``
 - Support for ADE7880 3 phase energy monitor as used in Shelly 3EM [#13515](https://github.com/arendst/Tasmota/issues/13515)
 - Support for PCF85363 RTC as used in Shelly 3EM (#13515)
-- Full DS3231 integration and synchronisation when using UBX (=GPS), NTP or manual time
+- Full RTC chip integration and synchronisation when using UBX (=GPS), NTP or manual time
+- NeoPool JSON modules, power module, cell info, chlorine, conductivity and ionization
 - ESP32 Berry always enable rules
 - ESP32 Berry bootloop protection
 - ESP32 support for BLE Mi scale V1 [#13517](https://github.com/arendst/Tasmota/issues/13517)
@@ -143,5 +144,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
 - BL0939, BL0940 and BL0942 energy monitoring buffer miscompares resulting in wrong daily energy values regression from v9.5.0.8 [#14829](https://github.com/arendst/Tasmota/issues/14829)
 - Wiegand 34-bit rfid reading and presentation [#14834](https://github.com/arendst/Tasmota/issues/14834)
 - Orno WE517 power meter phase 2 current reactive [#14841](https://github.com/arendst/Tasmota/issues/14841)
+- NeoPool NPBit and NPRead/NPReadL output
+- ESP32 PowerOnState [#15084](https://github.com/arendst/Tasmota/issues/15084)
 
 ### Removed
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index e358c66a7..fed56a30c 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -400,11 +400,13 @@ void SetPowerOnState(void)
 
   // Issue #526 and #909
   for (uint32_t i = 0; i < TasmotaGlobal.devices_present; i++) {
+#ifdef ESP8266
     if (!Settings->flag3.no_power_feedback) {  // SetOption63 - Don't scan relay power state at restart - #5594 and #5663
       if ((i < MAX_RELAYS) && PinUsed(GPIO_REL1, i)) {
         bitWrite(TasmotaGlobal.power, i, digitalRead(Pin(GPIO_REL1, i)) ^ bitRead(TasmotaGlobal.rel_inverted, i));
       }
     }
+#endif  // ESP8266
     if (bitRead(TasmotaGlobal.power, i) || (POWER_ALL_OFF_PULSETIME_ON == Settings->poweronstate)) {
       SetPulseTimer(i % MAX_PULSETIMERS, Settings->pulse_timer[i % MAX_PULSETIMERS]);
     }