diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 636ba5f..00dca1a 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -17645,7 +17645,11 @@
 		return ret;
 	}
 
+#ifdef HDD_WLAN_WAIT_TIME
+	timeout = msecs_to_jiffies(HDD_WLAN_WAIT_TIME);
+#else
 	timeout = msecs_to_jiffies(HDD_WLAN_START_WAIT_TIME);
+#endif
 
 	rc = wait_for_completion_timeout(&wlan_comp.wlan_start_comp, timeout);
 
diff --git a/Kbuild b/Kbuild
index 3c4bd8d..e26a7c9 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1062,6 +1062,10 @@
 CDEFINES += -DWLAN_POWER_DEBUGFS
 endif
 
+ifneq ($(CONFIG_HDD_WLAN_WAIT_TIME),)
+CDEFINES += -DHDD_WLAN_WAIT_TIME=$(CONFIG_HDD_WLAN_WAIT_TIME)
+endif
+
 ifeq ($(CONFIG_FEATURE_COEX_PTA_CONFIG_ENABLE), y)
 CDEFINES += -DFEATURE_COEX_PTA_CONFIG_ENABLE
 endif