diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
index c5cb26036..016d3dc7d 100644
--- a/src/engine/playback.cpp
+++ b/src/engine/playback.cpp
@@ -579,6 +579,7 @@ bool DivEngine::nextTick() {
     }
   }
   if (--ticks<=0) {
+    ret=endOfSong;
     nextRow();
   }
   // process stuff
@@ -674,8 +675,6 @@ bool DivEngine::nextTick() {
     lastCmds=totalCmds;
   }
 
-  ret=endOfSong;
-  endOfSong=false;
   return ret;
 }