diff --git a/renderdoc/driver/gl/gl_manager.h b/renderdoc/driver/gl/gl_manager.h
index 1da638eaf..7ac6c10e6 100644
--- a/renderdoc/driver/gl/gl_manager.h
+++ b/renderdoc/driver/gl/gl_manager.h
@@ -138,7 +138,7 @@ public:
     if(record)
     {
       auto it = m_CurrentResources.find(record->Resource);
-      if(it != m_CurrentResources.end())
+      if(it != m_CurrentResources.end() && it->second.first == id)
         it->second.second = NULL;
     }