diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp
index 13456e5d8..bfc8b6b20 100644
--- a/qrenderdoc/Windows/BufferViewer.cpp
+++ b/qrenderdoc/Windows/BufferViewer.cpp
@@ -1193,8 +1193,8 @@ void BufferViewer::OnEventChanged(uint32_t eventID)
     m_ModelVSOut->primRestart = 0;
     m_ModelGSOut->primRestart = 0;
 
-    if(m_Ctx.CurPipelineState().IsStripRestartEnabled() && (draw->flags & DrawFlags::UseIBuffer) &&
-       IsStrip(draw->topology))
+    if(m_Ctx.CurPipelineState().IsStripRestartEnabled() && draw &&
+       (draw->flags & DrawFlags::UseIBuffer) && IsStrip(draw->topology))
     {
       m_ModelVSIn->primRestart = m_Ctx.CurPipelineState().GetStripRestartIndex();