diff --git a/renderdoc/driver/vulkan/vk_core.h b/renderdoc/driver/vulkan/vk_core.h
index 424c44e7c..2404088bf 100644
--- a/renderdoc/driver/vulkan/vk_core.h
+++ b/renderdoc/driver/vulkan/vk_core.h
@@ -1067,7 +1067,13 @@ public:
     return it->second.state;
   }
 
-  uint32_t RemapQueue(uint32_t q) { return m_QueueRemapping[q][0].family; }
+  uint32_t RemapQueue(uint32_t q)
+  {
+    if(q >= ARRAY_COUNT(m_QueueRemapping) || m_QueueRemapping[q].empty())
+      return q;
+    return m_QueueRemapping[q][0].family;
+  }
+
   static rdcstr GetChunkName(uint32_t idx);
   VulkanResourceManager *GetResourceManager() { return m_ResourceManager; }
   VulkanDebugManager *GetDebugManager() { return m_DebugManager; }