diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 57c142b483e..9593b1cdf65 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -2401,6 +2401,8 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(
                     NULL, NULL);
         else
             DeviceInterfaceDetailData->DevicePath[0] = '\0';
+        if (DeviceInfoData && DeviceInfoData->cbSize == sizeof(SP_DEVINFO_DATA))
+            memcpy(DeviceInfoData, info->device, sizeof(SP_DEVINFO_DATA));
         ret = TRUE;
     }
     else
@@ -2467,6 +2469,8 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(
             lstrcpyW(DeviceInterfaceDetailData->DevicePath, info->symbolicLink);
         else
             DeviceInterfaceDetailData->DevicePath[0] = '\0';
+        if (DeviceInfoData && DeviceInfoData->cbSize == sizeof(SP_DEVINFO_DATA))
+            memcpy(DeviceInfoData, info->device, sizeof(SP_DEVINFO_DATA));
         ret = TRUE;
     }
     else