diff --git a/renderdocui/Windows/ShaderViewer.cs b/renderdocui/Windows/ShaderViewer.cs
index acc241f3b..bf2db7d78 100644
--- a/renderdocui/Windows/ShaderViewer.cs
+++ b/renderdocui/Windows/ShaderViewer.cs
@@ -1772,7 +1772,7 @@ namespace renderdocui.Windows
 
             bool firstStep = true;
 
-            while (true)
+            while (step < m_Trace.states.Length)
             {
                 if (m_Trace.states[step].nextInstruction == runToInstruction)
                     break;