diff --git a/platformio.ini b/platformio.ini
index 28433fa36..c515f2765 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -15,6 +15,7 @@ extra_configs =
 core_build_flags =
   -D ARDUINO_ARCH_ESP32=1
   -D ESP32=1
+  -O2
   -std=gnu++17
 
 core_unbuild_flags = -std=gnu++11
@@ -98,7 +99,6 @@ board_build.partitions = esp32_partition_16M.csv
 build_unflags = ${common.unbuild_flags}
 build_flags =
   ${espressi32_base.build_flags}
-  -O2
   '-DEMSESP_DEFAULT_BOARD_PROFILE="S32S3"'
 
 [env:esp32_4M]
@@ -108,7 +108,6 @@ board_upload.flash_size = 4MB
 board_build.partitions = esp32_partition_4M.csv
 build_flags =
   ${espressi32_base_tasmota.build_flags}
-  -Os
 
 [env:esp32_4Mplus]
 extends = espressi32_base_tasmota
@@ -163,7 +162,6 @@ board_upload.use_1200bps_touch = false
 board_upload.wait_for_upload_port = false
 build_flags =
   ${espressi32_base.build_flags}
-  -O2
   '-DEMSESP_DEFAULT_BOARD_PROFILE="S32S3"'
 
 ; to build and run: pio run -e standalone -t exec