diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c
index a4e51b71132e..3ad4a34c2f22 100644
--- a/core/hdd/src/wlan_hdd_nan_datapath.c
+++ b/core/hdd/src/wlan_hdd_nan_datapath.c
@@ -168,16 +168,11 @@ static int hdd_ndi_start_bss(struct hdd_adapter *adapter,
 {
 	int ret;
 	uint32_t roam_id;
-	struct hdd_wext_state *wext_state =
-		WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
-	struct csr_roam_profile *roam_profile = &wext_state->roamProfile;
+	struct csr_roam_profile *roam_profile;
 
 	hdd_enter();
 
-	if (!roam_profile) {
-		hdd_err("No valid roam profile");
-		return -EINVAL;
-	}
+	roam_profile = hdd_roam_profile(adapter);
 
 	if (HDD_WMM_USER_MODE_NO_QOS ==
 		(WLAN_HDD_GET_CTX(adapter))->config->WmmMode) {