diff --git a/platformio.ini b/platformio.ini
index d7d6caa45..c03175200 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -104,7 +104,9 @@ extra_scripts               = pio-tools/strip-floats.py
 build_unflags               = -Wall
 ;                              -mtarget-align
                               -Wdeprecated-declarations
-build_flags                 = -Wno-deprecated-declarations
+build_flags                 = -DCORE_DEBUG_LEVEL=0
+                              -Wl,-Map,firmware.map
+                              -Wno-deprecated-declarations
 ;                              -mno-target-align
                               -mtarget-align
                               -free
@@ -122,8 +124,6 @@ build_flags                 = -Wno-deprecated-declarations
 
 [esp82xx_defaults]
 build_flags                 = ${esp_defaults.build_flags}
-                              -Wl,-Map,firmware.map
-                              -DCORE_DEBUG_LEVEL=0
                               -DNDEBUG
                               -DFP_IN_IROM
                               -DBEARSSL_SSL_BASIC
diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index cb5d9c2e5..7234d9417 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -73,7 +73,6 @@ lib_extra_dirs              =
 build_unflags               = ${esp_defaults.build_unflags}
                               -Wpointer-arith
 build_flags                 = ${esp_defaults.build_flags}
-                              -DCORE_DEBUG_LEVEL=0
                               -DBUFFER_LENGTH=128
                               -DHTTP_UPLOAD_BUFLEN=2048
                               -DMQTT_MAX_PACKET_SIZE=1200