diff --git a/platformio.ini b/platformio.ini
index 6a3820d02..f29d5f363 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -87,17 +87,21 @@ extra_scripts             = pio/strip-floats.py
                             pio/name-firmware.py
                             pio/gzip-firmware.py
 
-[esp82xx_defaults]
-build_flags               = -D NDEBUG
-                            -mtarget-align
-                            -Wl,-Map,firmware.map
-                            -DFP_IN_IROM
-; new mechanism to set the IRremoteESP8266 supported protocols: none except HASH, NEC, RC5, RC6
-                            -D_IR_ENABLE_DEFAULT_=false
+[esp_defaults]
+build_flags               = -D_IR_ENABLE_DEFAULT_=false
                             -DDECODE_HASH=true -DDECODE_NEC=true -DSEND_NEC=true
                             -DDECODE_RC5=true -DSEND_RC5=true -DDECODE_RC6=true -DSEND_RC6=true
+; new mechanism to set the IRremoteESP8266 supported protocols: none except HASH, NEC, RC5, RC6
 
-[irremoteesp8266_full]
+[esp82xx_defaults]
+build_flags               = ${esp_defaults.build_flags}
+                            -Wl,-Map,firmware.map
+                            -D NDEBUG
+                            -mtarget-align
+                            -DFP_IN_IROM
+
+
+[irremoteesp_full]
 build_flags               = -DUSE_IR_REMOTE_FULL
                             -U_IR_ENABLE_DEFAULT_
                             -DDECODE_PRONTO=false -DSEND_PRONTO=false