diff --git a/src/engine/shared/demo.cpp b/src/engine/shared/demo.cpp
index 0a288b69f..489ee15ae 100644
--- a/src/engine/shared/demo.cpp
+++ b/src/engine/shared/demo.cpp
@@ -754,7 +754,7 @@ int CDemoPlayer::SetPos(float Percent)
 	m_Info.m_PreviousTick = -1;
 
 	// playback everything until we hit our tick
-	while(m_Info.m_PreviousTick < WantedTick)
+	while(m_Info.m_PreviousTick < WantedTick && IsPlaying())
 		DoTick();
 
 	Play();