diff --git a/MLight/MLight.slcp b/MLight/MLight.slcp
index 02e532a..36bdd3f 100644
--- a/MLight/MLight.slcp
+++ b/MLight/MLight.slcp
@@ -134,7 +134,11 @@ configuration:
     condition:
       - zigbee_end_device_support
   - name: EMBER_AF_PLUGIN_END_DEVICE_SUPPORT_WAKE_TIMEOUT_SECONDS
-    value: 1.5f
+    value: 3
+    condition:
+      - zigbee_end_device_support
+  - name: EMBER_AF_REJOIN_ATTEMPTS_MAX
+    value: 128
     condition:
       - zigbee_end_device_support
   - name: SL_IOSTREAM_USART_VCOM_RESTRICT_ENERGY_MODE_TO_ALLOW_RECEPTION
diff --git a/MLight/mods/device-nwk-join-control.c b/MLight/mods/device-nwk-join-control.c
index 45d79b9..8723aa1 100644
--- a/MLight/mods/device-nwk-join-control.c
+++ b/MLight/mods/device-nwk-join-control.c
@@ -117,7 +117,6 @@ void emberAfStackStatusCallback(EmberStatus status)
 
   switch (nwkState) {
     case EMBER_NO_NETWORK:
-    case EMBER_JOINED_NETWORK_NO_PARENT:
       // Keep trying finding the network
       sl_zigbee_event_set_inactive( &dnjcState.dnjcEvent );
       dnjcState.smPostTransition = _event_state_indicate_startup_nwk;
@@ -125,6 +124,11 @@ void emberAfStackStatusCallback(EmberStatus status)
       dnjcState.leavingNwk = false; // leave has completed.
       stopIdentifying();
       break;
+
+    case EMBER_JOINED_NETWORK_NO_PARENT:
+      sl_zigbee_app_debug_println("EMBER_JOINED_NETWORK_NO_PARENT");
+      break;
+
     default:
       break;
   }
diff --git a/MLight/mods/device-nwk-join-control.h b/MLight/mods/device-nwk-join-control.h
index 4e88bfd..61df887 100644
--- a/MLight/mods/device-nwk-join-control.h
+++ b/MLight/mods/device-nwk-join-control.h
@@ -2,7 +2,7 @@
 #define _DEVICE_NWK_JOIN_CONTROL_H_
 
 #ifndef DNJC_STARTUP_STATUS_DELAY_MS
-#define DNJC_STARTUP_STATUS_DELAY_MS 3000
+#define DNJC_STARTUP_STATUS_DELAY_MS 5000
 #endif
 
 #include <af-types.h>