diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index c8e7bd9..1fceb4a 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -1170,7 +1170,8 @@
     const auto& data = GetData(device);
 
     data.driver.GetDeviceQueue2(device, pQueueInfo, pQueue);
-    SetData(*pQueue, data);
+    if (pQueue != VK_NULL_HANDLE)
+        SetData(*pQueue, data);
 }
 
 VKAPI_ATTR VkResult