diff --git a/renderdoc/driver/gl/gl_renderstate.cpp b/renderdoc/driver/gl/gl_renderstate.cpp
index a66fc146a..03473129e 100644
--- a/renderdoc/driver/gl/gl_renderstate.cpp
+++ b/renderdoc/driver/gl/gl_renderstate.cpp
@@ -907,6 +907,12 @@ void GLRenderState::FetchState(WrappedOpenGL *gl)
       if(prog == 0)
         continue;
 
+      GLint numSubroutines = 0;
+      m_Real->glGetProgramStageiv(prog, shs[s], eGL_ACTIVE_SUBROUTINES, &numSubroutines);
+
+      if(numSubroutines == 0)
+        continue;
+
       m_Real->glGetProgramStageiv(prog, shs[s], eGL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS,
                                   &Subroutines[s].numSubroutines);