diff --git a/src/main.c b/src/main.c
index 74bfcf8..08e26e1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -197,7 +197,10 @@ bool button_pressed_state = false;
 uint32_t button_pressed_time = 0;
 uint8_t button_press = 0;
 bool wait_button() {
-    uint32_t button_timeout = 15000;
+    /* Disabled by default. As LED may not be properly configured,
+       it will not be possible to indicate button press unless it
+       is commissioned. */
+    uint32_t button_timeout = 0;
     if (phy_data.up_btn_present) {
         button_timeout = phy_data.up_btn * 1000;
         if (button_timeout == 0) {