diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h
index 981be1aa..a42abc66 100644
--- a/code/espurna/config/hardware.h
+++ b/code/espurna/config/hardware.h
@@ -177,7 +177,7 @@
     #define BUTTON1_MODE        BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH
     #define BUTTON1_RELAY       1
     #define BUTTON2_PIN         14
-    #define BUTTON2_MODE        BUTTON_SWITCH | BUTTON_SET_PULLUP
+    #define BUTTON2_MODE        BUTTON_SWITCH | BUTTON_SET_PULLUP | BUTTON_DEFAULT_HIGH
     #define BUTTON2_RELAY       1
 
     // Relays
@@ -199,7 +199,7 @@
     #define BUTTON1_MODE        BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH
     #define BUTTON1_RELAY       1
     #define BUTTON2_PIN         14
-    #define BUTTON2_MODE        BUTTON_SWITCH | BUTTON_SET_PULLUP
+    #define BUTTON2_MODE        BUTTON_SWITCH | BUTTON_SET_PULLUP | BUTTON_DEFAULT_HIGH
     #define BUTTON2_RELAY       1
 
     // Relays
@@ -375,14 +375,14 @@
     #define DEVICE              "SONOFF_DUAL_R2"
 
     // Buttons
-    #define BUTTON1_PIN         0
-    #define BUTTON2_PIN         9
-    #define BUTTON3_PIN         10
+    #define BUTTON1_PIN         0       // Button 0 on header
+    #define BUTTON2_PIN         9       // Button 1 on header
+    #define BUTTON3_PIN         10      // Physical button
     #define BUTTON1_RELAY       1
     #define BUTTON2_RELAY       2
     #define BUTTON3_RELAY       1
-    #define BUTTON1_MODE        BUTTON_SWITCH | BUTTON_SET_PULLUP
-    #define BUTTON2_MODE        BUTTON_SWITCH | BUTTON_SET_PULLUP
+    #define BUTTON1_MODE        BUTTON_SWITCH | BUTTON_SET_PULLUP | BUTTON_DEFAULT_HIGH
+    #define BUTTON2_MODE        BUTTON_SWITCH | BUTTON_SET_PULLUP | BUTTON_DEFAULT_HIGH
     #define BUTTON3_MODE        BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH
 
     // Relays