diff --git a/renderdoc/driver/gl/gl_manager.cpp b/renderdoc/driver/gl/gl_manager.cpp
index 6c7b329ec..4fe9ff112 100644
--- a/renderdoc/driver/gl/gl_manager.cpp
+++ b/renderdoc/driver/gl/gl_manager.cpp
@@ -171,7 +171,10 @@ bool GLResourceManager::Serialise_InitialState(GLResource res)
 
 void GLResourceManager::Create_InitialState(ResourceId id, GLResource live, bool hasData)
 {
-	RDCUNIMPLEMENTED("Expect all initial states to be created & not skipped, presently");
+	if(live.Namespace != eResBuffer)
+	{
+		RDCUNIMPLEMENTED("Expect all initial states to be created & not skipped, presently");
+	}
 }
 
 void GLResourceManager::Apply_InitialState(GLResource live, InitialContentData initial)