diff --git a/umac/cmn_services/obj_mgr/src/wlan_objmgr_vdev_obj.c b/umac/cmn_services/obj_mgr/src/wlan_objmgr_vdev_obj.c
index b2c920dc6035..e9666c2ee4cf 100644
--- a/umac/cmn_services/obj_mgr/src/wlan_objmgr_vdev_obj.c
+++ b/umac/cmn_services/obj_mgr/src/wlan_objmgr_vdev_obj.c
@@ -794,7 +794,9 @@ QDF_STATUS wlan_objmgr_vdev_peer_attach(struct wlan_objmgr_vdev *vdev,
 		wlan_vdev_set_selfpeer(vdev, peer);
 		opmode = wlan_vdev_mlme_get_opmode(vdev);
 		/* For AP mode, self peer and BSS peer are same */
-		if ((opmode == QDF_SAP_MODE) || (opmode == QDF_P2P_GO_MODE))
+		if ((opmode == QDF_SAP_MODE) ||
+		    (opmode == QDF_P2P_GO_MODE) ||
+		    (opmode == QDF_NDI_MODE))
 			wlan_vdev_set_bsspeer(vdev, peer);
 	}
 	/* set BSS peer for sta */