diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index 614419d39..6e6fe4063 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -353,9 +353,10 @@ void WrappedVulkan::FlushQ()
   }
 
 #if ENABLED(SINGLE_FLUSH_VALIDATE)
+  if(m_Device != VK_NULL_HANDLE)
   {
-    ObjDisp(m_Queue)->DeviceWaitIdle(Unwrap(m_Device));
-    VkResult vkr = ObjDisp(m_Queue)->DeviceWaitIdle(Unwrap(m_Device));
+    ObjDisp(m_Device)->DeviceWaitIdle(Unwrap(m_Device));
+    VkResult vkr = ObjDisp(m_Device)->DeviceWaitIdle(Unwrap(m_Device));
     RDCASSERTEQUAL(vkr, VK_SUCCESS);
   }
 #endif