diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index e9e3153ca12d..e90d2960f755 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -3435,12 +3435,17 @@ static QDF_STATUS sap_get_freq_list(struct sap_context *sap_ctx,
 	} else {
 		*freq_list = NULL;
 		qdf_mem_free(list);
+		return QDF_STATUS_SUCCESS;
 	}
 
 	for (loop_count = 0; loop_count < ch_count; loop_count++) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
 			FL("channel frequency: %d"), list[loop_count]);
+		sap_ctx->acs_cfg->ch_list[loop_count] =
+			wlan_reg_freq_to_chan(mac_ctx->pdev, list[loop_count]);
 	}
+	sap_ctx->acs_cfg->ch_list_count = ch_count;
+
 	return QDF_STATUS_SUCCESS;
 }
 #endif