diff --git a/umac/scan/core/src/wlan_scan_manager.c b/umac/scan/core/src/wlan_scan_manager.c
index d5fd0f1df9e3..6975b1237c66 100644
--- a/umac/scan/core/src/wlan_scan_manager.c
+++ b/umac/scan/core/src/wlan_scan_manager.c
@@ -1198,12 +1198,16 @@ scm_update_channel_list(struct scan_start_request *req,
 	}
 
 	req->scan_req.chan_list.num_chan = num_scan_channels;
-	/* Dont upadte the channel list for SAP mode */
+	/* Dont update the channel list:
+	 * - if not STA mode and
+	 * - if scan mode is set to SCAN_MODE_6G_NO_OPERATION
+	 */
 	op_mode = wlan_vdev_mlme_get_opmode(req->vdev);
 	if (op_mode != QDF_SAP_MODE &&
 	    op_mode != QDF_P2P_DEVICE_MODE &&
 	    op_mode != QDF_P2P_CLIENT_MODE &&
-	    op_mode != QDF_P2P_GO_MODE) {
+	    op_mode != QDF_P2P_GO_MODE &&
+	    scan_obj->scan_def.scan_mode_6g != SCAN_MODE_6G_NO_OPERATION) {
 		scm_update_6ghz_channel_list(req->vdev,
 					     &req->scan_req.chan_list,
 					     scan_obj);
diff --git a/umac/scan/dispatcher/inc/wlan_scan_cfg.h b/umac/scan/dispatcher/inc/wlan_scan_cfg.h
index a55e8d0c73bf..ae0069fff6ff 100644
--- a/umac/scan/dispatcher/inc/wlan_scan_cfg.h
+++ b/umac/scan/dispatcher/inc/wlan_scan_cfg.h
@@ -29,12 +29,14 @@
  * @SCAN_MODE_6G_NO_CHANNEL: Remove 6GHz channels in the scan request
  * @SCAN_MODE_6G_PSC_CHANNEL: Allow/Add 6Ghz PSC channels to scan request
  * @SCAN_MODE_6G_ALL_CHANNEL: Allow all the 6Ghz channels
+ * @SCAN_MODE_6G_NO_OPERATION: Don't perform any action keep channel list as is
  */
 enum scan_mode_6ghz {
 	SCAN_MODE_6G_NO_CHANNEL,
 	SCAN_MODE_6G_PSC_CHANNEL,
 	SCAN_MODE_6G_ALL_CHANNEL,
-	SCAN_MODE_6G_MAX = SCAN_MODE_6G_ALL_CHANNEL,
+	SCAN_MODE_6G_NO_OPERATION,
+	SCAN_MODE_6G_MAX = SCAN_MODE_6G_NO_OPERATION,
 };
 
 /*
@@ -1202,13 +1204,14 @@ enum scan_mode_6ghz {
  * <ini>
  * scan_mode_6ghz - 6ghz Scan mode
  * @Min: 0
- * @Max: 2
- * @Default: 2
+ * @Max: 3
+ * @Default: 1
  *
  * Configure the 6Ghz scan mode
  * 0 - Remove 6GHz channels in the scan request
  * 1 - Allow/Add 6Ghz PSC channels to scan request
  * 2 - Allow all the 6Ghz channels
+ * 3 - Don't perform any action keep channel list as is
  *
  * Related: SCAN
  *