diff --git a/os_if/linux/nan/src/os_if_nan.c b/os_if/linux/nan/src/os_if_nan.c
index 614bf2febb..b55ec22fec 100644
--- a/os_if/linux/nan/src/os_if_nan.c
+++ b/os_if/linux/nan/src/os_if_nan.c
@@ -240,7 +240,7 @@ static int os_if_nan_process_ndi_delete(struct wlan_objmgr_psoc *psoc,
 	/* delete all peer for this interface first */
 	wlan_objmgr_iterate_obj_list(psoc, WLAN_PEER_OP,
 				     os_if_nan_vdev_delete_peer,
-				     nan_vdev, 1, WLAN_UMAC_COMP_NAN);
+				     nan_vdev, 1, WLAN_NAN_ID);
 
 	/*
 	 * wlan_util_get_vdev_by_ifname increments ref count
diff --git a/umac/nan/core/src/nan_api.c b/umac/nan/core/src/nan_api.c
index 8dd6ff9130..f35a7f18ba 100644
--- a/umac/nan/core/src/nan_api.c
+++ b/umac/nan/core/src/nan_api.c
@@ -112,11 +112,11 @@ static QDF_STATUS nan_psoc_obj_destroyed_notification(
 
 	wlan_objmgr_iterate_obj_list(psoc, WLAN_PEER_OP,
 				     nan_psoc_delete_peer,
-				     NULL, 1, WLAN_UMAC_COMP_NAN);
+				     NULL, 1, WLAN_NAN_ID);
 
 	wlan_objmgr_iterate_obj_list(psoc, WLAN_VDEV_OP,
 				     nan_psoc_delete_vdev,
-				     NULL, 1, WLAN_UMAC_COMP_NAN);
+				     NULL, 1, WLAN_NAN_ID);
 
 	status = wlan_objmgr_psoc_component_obj_detach(psoc,
 					WLAN_UMAC_COMP_NAN, nan_obj);