diff --git a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
index 0d191aecd..6d9730e09 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
@@ -998,6 +998,9 @@ void WrappedVulkan::CaptureQueueSubmit(VkQueue queue,
       GetResourceManager()->MarkResourceFrameReferenced(GetResID(fence), eFrameRef_Read);
 
     rdcarray<VkResourceRecord *> maps;
+
+    // don't flush maps when there are no command buffers
+    if(!commandBuffers.empty())
     {
       SCOPED_LOCK(m_CoherentMapsLock);
       maps = m_CoherentMaps;