diff --git a/renderdocui/Windows/TextureViewer.cs b/renderdocui/Windows/TextureViewer.cs
index 68137e4a5..d793c8735 100644
--- a/renderdocui/Windows/TextureViewer.cs
+++ b/renderdocui/Windows/TextureViewer.cs
@@ -3793,7 +3793,7 @@ namespace renderdocui.Windows
 
                             // if the usage is different from the last, add a new entry,
                             // or if the previous draw link is broken.
-                            if (u.usage != us || curDraw.previous == null)
+                            if (u.usage != us || curDraw == null || curDraw.previous == null)
                             {
                                 distinct = true;
                             }