diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs
index cad30ed4a..62519fd61 100644
--- a/renderdocui/Windows/BufferViewer.cs
+++ b/renderdocui/Windows/BufferViewer.cs
@@ -2414,7 +2414,7 @@ namespace renderdocui.Windows
                     m_MeshDisplay.position.numVerts = ui.m_Data.PostVS.numVerts;
                 }
 
-                if ((ui.m_Input.Drawcall.flags & DrawcallFlags.UseIBuffer) == 0)
+                if ((ui.m_Input.Drawcall.flags & DrawcallFlags.UseIBuffer) == 0 || ui.m_Stage == MeshDataStage.GSOut)
                 {
                     m_MeshDisplay.position.idxbuf = ResourceId.Null;
                     m_MeshDisplay.position.idxoffs = 0;