diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index a6143eee6f..88789dcade 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -429,6 +429,10 @@ void WLED::setup()
 
   DEBUG_PRINT(F("heap ")); DEBUG_PRINTLN(ESP.getFreeHeap());
 
+  // Set all button pins without an assigned type to -1.
+  // This is necessary because partially initializing an array fills the remaining elements with 0, which is a valid GPIO.
+  for (unsigned i=0; i<WLED_MAX_BUTTONS; i++) if (buttonType[i] == BTN_TYPE_NONE) btnPin[i] = -1;
+
   bool fsinit = false;
   DEBUGFS_PRINTLN(F("Mount FS"));
 #ifdef ARDUINO_ARCH_ESP32
diff --git a/wled00/wled.h b/wled00/wled.h
index d6915e7fb5..c364df3372 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -277,10 +277,10 @@ WLED_GLOBAL char otaPass[33] _INIT(DEFAULT_OTA_PASS);
 
 // Hardware and pin config
 #ifndef BTNPIN
-  #define BTNPIN 0,-1
+  #define BTNPIN 0
 #endif
 #ifndef BTNTYPE
-  #define BTNTYPE BTN_TYPE_PUSH,BTN_TYPE_NONE
+  #define BTNTYPE BTN_TYPE_PUSH
 #endif
 #ifndef RLYPIN
 WLED_GLOBAL int8_t rlyPin _INIT(-1);