diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c
index abb980c3777f..59a1fdb54f37 100644
--- a/core/sap/src/sap_module.c
+++ b/core/sap/src/sap_module.c
@@ -1706,6 +1706,12 @@ QDF_STATUS wlansap_channel_change_request(struct sap_context *sapContext,
 	eCsrPhyMode phy_mode;
 	struct ch_params *ch_params;
 
+	if (!target_channel) {
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
+			  "%s: channel 0 requested", __func__);
+		return QDF_STATUS_E_FAULT;
+	}
+
 	if (NULL == sapContext) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer", __func__);
diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c
index 0c7074f074e3..7c90d67d03e2 100644
--- a/core/wma/src/wma_dev_if.c
+++ b/core/wma/src/wma_dev_if.c
@@ -2572,6 +2572,12 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma,
 		return QDF_STATUS_E_FAILURE;
 	}
 
+	if (req->chan == 0) {
+		WMA_LOGE("%s: invalid channel: %d", __func__, req->chan);
+		QDF_ASSERT(0);
+		return QDF_STATUS_E_INVAL;
+	}
+
 	params.band_center_freq1 = cds_chan_to_freq(req->chan);
 	ch_width = req->chan_width;
 	bw_val = wlan_reg_get_bw_value(req->chan_width);