diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index 1a31ad0d24..c794c031f0 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -158,10 +158,13 @@
 #define ACS_IN_PROGRESS        (0)
 
 /** Maximum time(ms)to wait for disconnect to complete **/
+/*  This value should be larger than the timeout used by WMA to wait for
+ *  stop vdev response from FW
+ */
 #ifdef QCA_WIFI_3_0_EMU
-#define WLAN_WAIT_TIME_DISCONNECT  5000
+#define WLAN_WAIT_TIME_DISCONNECT  7000
 #else
-#define WLAN_WAIT_TIME_DISCONNECT  5000
+#define WLAN_WAIT_TIME_DISCONNECT  7000
 #endif
 #define WLAN_WAIT_DISCONNECT_ALREADY_IN_PROGRESS  1000
 #define WLAN_WAIT_TIME_STOP_ROAM  4000