diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index df0a821c73cb..3ba200cd4cd4 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -1740,8 +1740,10 @@ QDF_STATUS sap_goto_channel_sel(struct sap_context *sap_context,
 #endif
 	}
 
-	if (policy_mgr_get_concurrency_mode(mac_ctx->psoc) ==
-		(QDF_STA_MASK | QDF_SAP_MASK)) {
+	if ((policy_mgr_get_concurrency_mode(mac_ctx->psoc) ==
+		(QDF_STA_MASK | QDF_SAP_MASK)) ||
+	    (policy_mgr_get_concurrency_mode(mac_ctx->psoc) ==
+		(QDF_STA_MASK | QDF_P2P_GO_MASK))) {
 #ifdef FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE
 		if (sap_context->channel == AUTO_CHANNEL_SELECT)
 			sap_context->dfs_ch_disable = true;