diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 8e88df545..2709cf823 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -4889,11 +4889,11 @@ void DivEngine::playSub(bool preserveDrift, int goalRow) {
   speedAB=false;
   playing=true;
   for (int i=0; i<song.systemLen; i++) disCont[i].dispatch->setSkipRegisterWrites(true);
-  while (curOrder<goal) {
+  while (playing && curOrder<goal) {
     if (nextTick(preserveDrift)) break;
   }
   int oldOrder=curOrder;
-  while (curRow<goalRow) {
+  while (playing && curRow<goalRow) {
     if (nextTick(preserveDrift)) break;
     if (oldOrder!=curOrder) break;
   }
diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
index ed99a31e5..3539800e5 100644
--- a/src/engine/playback.cpp
+++ b/src/engine/playback.cpp
@@ -859,7 +859,7 @@ void DivEngine::nextRow() {
       changeOrd=-1;
     }
     if (haltOn==DIV_HALT_PATTERN) halted=true;
-  } else if (++curRow>=song.patLen) {
+  } else if (playing) if (++curRow>=song.patLen) {
     nextOrder();
     if (haltOn==DIV_HALT_PATTERN) halted=true;
   }