diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c
index 5e40ba138d34..57f006ff4272 100644
--- a/core/hdd/src/wlan_hdd_nan_datapath.c
+++ b/core/hdd/src/wlan_hdd_nan_datapath.c
@@ -186,13 +186,11 @@ static int hdd_ndi_start_bss(struct hdd_adapter *adapter,
 
 	roam_profile->csrPersona = adapter->device_mode;
 
+	if (!operating_channel)
+		operating_channel = NAN_SOCIAL_CHANNEL_2_4GHZ;
+
 	roam_profile->ChannelInfo.numOfChannels = 1;
-	if (operating_channel) {
-		roam_profile->ChannelInfo.ChannelList = &operating_channel;
-	} else {
-		roam_profile->ChannelInfo.ChannelList[0] =
-			NAN_SOCIAL_CHANNEL_2_4GHZ;
-	}
+	roam_profile->ChannelInfo.ChannelList = &operating_channel;
 
 	roam_profile->SSIDs.numOfSSIDs = 1;
 	roam_profile->SSIDs.SSIDList->SSID.length = 0;