diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 0afb46458df9..22673f0937c9 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -5494,15 +5494,14 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx)
 			hdd_clear_fils_connection_info(adapter);
 
 		if (adapter->device_mode == QDF_SAP_MODE) {
+			wlansap_cleanup_cac_timer(
+				WLAN_HDD_GET_SAP_CTX_PTR(adapter));
 			/*
 			 * If adapter is SAP, set session ID to invalid
 			 * since SAP session will be cleanup during SSR.
 			 */
 			wlansap_set_invalid_session(
 				WLAN_HDD_GET_SAP_CTX_PTR(adapter));
-
-			wlansap_cleanup_cac_timer(
-				WLAN_HDD_GET_SAP_CTX_PTR(adapter));
 		}
 
 		/* Delete connection peers if any to avoid peer object leaks */
diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index 6de10df1093b..8e8d45aa8262 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -1427,6 +1427,13 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx,
 		sap_ap_event.sapHddEventCode = eSAP_START_BSS_EVENT;
 		bss_complete = &sap_ap_event.sapevt.sapStartBssCompleteEvent;
 
+		bss_complete->sessionId = sap_ctx->sessionId;
+		if (bss_complete->sessionId == CSR_SESSION_ID_INVALID) {
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
+				  FL("Invalid sessionId"));
+			return QDF_STATUS_E_INVAL;
+		}
+
 		bss_complete->status = (eSapStatus) context;
 		bss_complete->staId = sap_ctx->sap_sta_id;
 
@@ -1436,7 +1443,6 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx,
 
 		bss_complete->operatingChannel = (uint8_t) sap_ctx->channel;
 		bss_complete->ch_width = sap_ctx->ch_params.ch_width;
-		bss_complete->sessionId = sap_ctx->sessionId;
 		break;
 	case eSAP_DFS_CAC_START:
 	case eSAP_DFS_CAC_INTERRUPTED: