diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h
index c1d1d287..23f25968 100644
--- a/code/espurna/config/hardware.h
+++ b/code/espurna/config/hardware.h
@@ -415,9 +415,11 @@
     #define DEVICE              "SONOFF_RFBRIDGE"
     #define SERIAL_BAUDRATE     19200
     #define RELAY_PROVIDER      RELAY_PROVIDER_RFBRIDGE
-    #define DUMMY_RELAY_COUNT   6
     #define TRACK_RELAY_STATUS  0
-    #define TERMINAL_SUPPORT     0
+    #define TERMINAL_SUPPORT    0
+    #ifndef DUMMY_RELAY_COUNT
+    #define DUMMY_RELAY_COUNT   6
+    #endif
 
     // Buttons
     #define BUTTON1_PIN         0
diff --git a/code/platformio.ini b/code/platformio.ini
index 011924d1..bb677fe6 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -4,7 +4,7 @@ src_dir = espurna
 data_dir = espurna/data
 
 [common]
-build_flags = -g -DMQTT_MAX_PACKET_SIZE=400
+build_flags = -g -DMQTT_MAX_PACKET_SIZE=400 ${env.FLAGS}
 build_flags_512k = ${common.build_flags} -Wl,-Tesp8266.flash.512k0.ld
 build_flags_1m = ${common.build_flags} -Wl,-Tesp8266.flash.1m0.ld
 lib_deps =