diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp
index 51186053f..e83f5fbc1 100644
--- a/renderdoc/driver/gl/gl_driver.cpp
+++ b/renderdoc/driver/gl/gl_driver.cpp
@@ -2937,8 +2937,16 @@ bool WrappedOpenGL::Serialise_BeginCaptureFrame(SerialiserType &ser)
 
   if(ser.IsWriting())
   {
+    rdcarray<DebugMessage> savedDebugMessages;
+
+    // save any debug messages we built up
+    savedDebugMessages.swap(m_DebugMessages);
+
     state.FetchState(this);
     state.MarkReferenced(this, true);
+
+    // restore saved messages - which implicitly discards any generated while fetching state
+    savedDebugMessages.swap(m_DebugMessages);
   }
 
   SERIALISE_ELEMENT(state);