diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index d9018fa..dbbec9f 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -2498,7 +2498,7 @@
  * Return: QDF_STATUS
  */
 
-#define SAP_OPEN_SESSION_TIMEOUT 2000
+#define SAP_OPEN_SESSION_TIMEOUT 30000
 QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext,
 			    uint32_t *session_id)
 {
diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h
index a1a9087..28a14b9 100644
--- a/core/sme/src/csr/csr_inside_api.h
+++ b/core/sme/src/csr/csr_inside_api.h
@@ -100,7 +100,7 @@
  * The MAX BSSID Count should be lower than the command timeout value and it
  * can be of a fraction of 3/4 of the total command timeout value.
  * ***************************************************************************/
-#define CSR_ACTIVE_LIST_CMD_TIMEOUT_VALUE (1000*30*4)
+#define CSR_ACTIVE_LIST_CMD_TIMEOUT_VALUE (1000*30)
 #ifdef QCA_WIFI_3_0_EMU
 #define CSR_ACTIVE_SCAN_LIST_CMD_TIMEOUT (1000*30*20)
 #else