diff --git a/renderdocui/Windows/TextureViewer.cs b/renderdocui/Windows/TextureViewer.cs
index 4ba2e83cf..470b92b54 100644
--- a/renderdocui/Windows/TextureViewer.cs
+++ b/renderdocui/Windows/TextureViewer.cs
@@ -1521,7 +1521,7 @@ namespace renderdocui.Windows
             m_TexDisplay.typeHint = m_Following.GetTypeHint(m_Core);
 
             // if there is no such type or it isn't being followed, use the last seen interpretation
-            if (m_TexDisplay.typeHint == FormatComponentType.None)
+            if (m_TexDisplay.typeHint == FormatComponentType.None && m_TextureSettings.ContainsKey(m_TexDisplay.texid))
                 m_TexDisplay.typeHint = m_TextureSettings[m_TexDisplay.texid].typeHint;
 
             m_CurPixelValue = null;