diff --git a/renderdoc/driver/d3d11/d3d11_debug.cpp b/renderdoc/driver/d3d11/d3d11_debug.cpp
index 64530b6a1..9c6664cb1 100644
--- a/renderdoc/driver/d3d11/d3d11_debug.cpp
+++ b/renderdoc/driver/d3d11/d3d11_debug.cpp
@@ -3930,8 +3930,8 @@ void D3D11DebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID)
 			}
 
 			// if we read out of bounds, we'll also have a 0 index being referenced
-			// (as 0 is read)
-			if(numIndices < drawcall->numIndices)
+			// (as 0 is read). Don't insert 0 if we already have 0 though
+			if(numIndices < drawcall->numIndices && (indices.empty() || indices[0] != 0))
 				indices.insert(indices.begin(), 0);
 
 			// An index buffer could be something like: 500, 501, 502, 501, 503, 502
diff --git a/renderdoc/driver/gl/gl_debug.cpp b/renderdoc/driver/gl/gl_debug.cpp
index 25efac2c4..96d9c963d 100644
--- a/renderdoc/driver/gl/gl_debug.cpp
+++ b/renderdoc/driver/gl/gl_debug.cpp
@@ -2295,8 +2295,8 @@ void GLReplay::InitPostVSBuffers(uint32_t frameID, uint32_t eventID)
 		}
 
 		// if we read out of bounds, we'll also have a 0 index being referenced
-		// (as 0 is read)
-		if(numIndices < drawcall->numIndices)
+		// (as 0 is read). Don't insert 0 if we already have 0 though
+		if(numIndices < drawcall->numIndices && (indices.empty() || indices[0] != 0))
 			indices.insert(indices.begin(), 0);
 
 		// An index buffer could be something like: 500, 501, 502, 501, 503, 502