diff --git a/tasmota/settings.h b/tasmota/settings.h
index e5c9800fd..f4139a748 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -362,12 +362,15 @@ struct {
   char          ex_friendlyname[4][33];    // 3AC
   char          ex_switch_topic[33];       // 430
 #else  // ESP32
-#ifdef FINAL_ESP32
+#ifndef FINAL_ESP32
+  char          ex_friendlyname[4][33];    // 3AC
+  char          ex_switch_topic[33];       // 430
+#else  // FINAL_ESP32
   myio          my_gp;                     // 3AC - 2 x 40 bytes (ESP32)
   mytmplt       user_template;             // 3FC - 2 x 37 bytes (ESP32)
 
   uint8_t       free_esp32_446[11];        // 446
-#endif
+#endif  // FINAL_ESP32
 #endif  // ESP8266 - ESP32
 
   char          serial_delimiter;          // 451
@@ -420,7 +423,9 @@ struct {
   mytmplt       user_template;             // 580 - 37 bytes (ESP32)
 
   uint8_t       free_esp32_5a5[23];        // 5A5
-#endif
+#else  // FINAL_ESP32
+  char          ex_mqtt_fulltopic[100];    // 558
+#endif  // FINAL_ESP32
 #endif  // ESP8266 - ESP32
 
   SysBitfield2  flag2;                     // 5BC