diff --git a/renderdoc/driver/d3d11/d3d11_debug.cpp b/renderdoc/driver/d3d11/d3d11_debug.cpp
index 6a2f4e708..62d497765 100644
--- a/renderdoc/driver/d3d11/d3d11_debug.cpp
+++ b/renderdoc/driver/d3d11/d3d11_debug.cpp
@@ -164,9 +164,11 @@ D3D11DebugManager::~D3D11DebugManager()
     SaveShaderCache("d3dshaders.cache", m_ShaderCacheMagic, m_ShaderCacheVersion, m_ShaderCache,
                     ShaderCacheCallbacks);
   }
-
-  for(auto it = m_ShaderCache.begin(); it != m_ShaderCache.end(); ++it)
-    ShaderCacheCallbacks.Destroy(it->second);
+  else
+  {
+    for(auto it = m_ShaderCache.begin(); it != m_ShaderCache.end(); ++it)
+      ShaderCacheCallbacks.Destroy(it->second);
+  }
 
   ShutdownFontRendering();
   ShutdownStreamOut();
diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp
index a7e62720b..d2915cee4 100644
--- a/renderdoc/driver/vulkan/vk_debug.cpp
+++ b/renderdoc/driver/vulkan/vk_debug.cpp
@@ -2101,9 +2101,11 @@ VulkanDebugManager::~VulkanDebugManager()
     SaveShaderCache("vkshaders.cache", m_ShaderCacheMagic, m_ShaderCacheVersion, m_ShaderCache,
                     ShaderCacheCallbacks);
   }
-
-  for(auto it = m_ShaderCache.begin(); it != m_ShaderCache.end(); ++it)
-    ShaderCacheCallbacks.Destroy(it->second);
+  else
+  {
+    for(auto it = m_ShaderCache.begin(); it != m_ShaderCache.end(); ++it)
+      ShaderCacheCallbacks.Destroy(it->second);
+  }
 
   for(auto it = m_PostVSData.begin(); it != m_PostVSData.end(); ++it)
   {