diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp
index 531332da5cd52b19256d1cbf89349847b8bff29e..6bbe38a67d2129d2b8f3da6799203318106e8d97 100644
--- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp
+++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp
@@ -320,6 +320,14 @@ ErrCode WifiP2pService::QueryP2pDevices(std::vector<WifiP2pDevice> &devices)
 ErrCode WifiP2pService::QueryP2pLocalDevice(WifiP2pDevice &device)
 {
     LOGI("QueryP2pLocalDevice");
+#ifdef NON_SEPERATE_P2P
+    std::string deviceAddr;
+    if (WifiP2PHalInterface::GetInstance().GetDeviceAddress(deviceAddr) == WifiErrorNo::WIFI_HAL_OPT_FAILED) {
+        WIFI_LOGE("Failed to get device address.");
+        return ErrCode::WIFI_OPT_FAILED;
+    }
+    deviceManager.GetThisDevice().SetDeviceAddress(deviceAddr);
+#endif
     device = deviceManager.GetThisDevice();
     return ErrCode::WIFI_OPT_SUCCESS;
 }