diff --git a/wmi/src/wmi_unified_nan_tlv.c b/wmi/src/wmi_unified_nan_tlv.c
index de5706c8f514..04e1867401e8 100644
--- a/wmi/src/wmi_unified_nan_tlv.c
+++ b/wmi/src/wmi_unified_nan_tlv.c
@@ -75,18 +75,21 @@ extract_nan_event_rsp_tlv(wmi_unified_t wmi_handle, void *evt_buf,
 	}
 	nan_msg_hdr = (nan_msg_header_t *)event->data;
 
-	if (!wmi_service_enabled(wmi_handle, wmi_service_nan_dbs_support) &&
-	    !wmi_service_enabled(wmi_handle, wmi_service_nan_disable_support)) {
-		evt_params->evt_type = nan_event_id_generic_rsp;
-		return QDF_STATUS_SUCCESS;
-	}
-
 	switch (nan_msg_hdr->msg_id) {
 	case NAN_MSG_ID_ENABLE_RSP:
 		nan_evt_info = event->event_info;
 		if (!nan_evt_info) {
-			wmi_err("Fail: NAN enable rsp event info Null");
-			return QDF_STATUS_E_INVAL;
+			if (!wmi_service_enabled(wmi_handle,
+						 wmi_service_nan_dbs_support) &&
+			    !wmi_service_enabled(wmi_handle,
+						 wmi_service_nan_disable_support
+						 )) {
+				evt_params->evt_type = nan_event_id_generic_rsp;
+				break;
+			} else {
+				wmi_err("Fail: NAN enable rsp event info Null");
+				return QDF_STATUS_E_INVAL;
+			}
 		}
 		evt_params->evt_type = nan_event_id_enable_rsp;
 		evt_params->mac_id = nan_evt_info->mac_id;