diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
index feec7d961..6a27dc65e 100644
--- a/src/engine/playback.cpp
+++ b/src/engine/playback.cpp
@@ -268,26 +268,53 @@ void DivEngine::processRow(int i, bool afterDelay) {
   int whatRow=afterDelay?chan[i].delayRow:curRow;
   DivPattern* pat=song.pat[i].getPattern(song.orders.ord[i][whatOrder],false);
   // pre effects
-  if (!afterDelay) for (int j=0; j<song.pat[i].effectCols; j++) {
-    short effect=pat->data[whatRow][4+(j<<1)];
-    short effectVal=pat->data[whatRow][5+(j<<1)];
+  if (!afterDelay) {
+    bool returnAfterPre=false;
+    for (int j=0; j<song.pat[i].effectCols; j++) {
+      short effect=pat->data[whatRow][4+(j<<1)];
+      short effectVal=pat->data[whatRow][5+(j<<1)];
 
-    if (effectVal==-1) effectVal=0;
-    if (effect==0xed && effectVal!=0) {
-      if (effectVal<=nextSpeed) {
-        chan[i].rowDelay=effectVal+1;
-        chan[i].delayOrder=whatOrder;
-        chan[i].delayRow=whatRow;
-        if (effectVal==nextSpeed) {
-          //if (sysOfChan[i]!=DIV_SYSTEM_YM2610 && sysOfChan[i]!=DIV_SYSTEM_YM2610_EXT) chan[i].delayLocked=true;
-        } else {
-          chan[i].delayLocked=false;
-        }
-        return;
-      } else {
-        chan[i].delayLocked=false;
+      if (effectVal==-1) effectVal=0;
+
+      switch (effect) {
+        case 0x09: // speed 1
+          if (effectVal>0) speed1=effectVal;
+          break;
+        case 0x0f: // speed 2
+          if (effectVal>0) speed2=effectVal;
+          break;
+        case 0x0b: // change order
+          if (changeOrd==-1) {
+            changeOrd=effectVal;
+            changePos=0;
+          }
+          break;
+        case 0x0d: // next order
+          if (changeOrd<0 && (curOrder<(song.ordersLen-1) || !song.ignoreJumpAtEnd)) {
+            changeOrd=-2;
+            changePos=effectVal;
+          }
+          break;
+        case 0xed: // delay
+          if (effectVal!=0) {
+            if (effectVal<=nextSpeed) {
+              chan[i].rowDelay=effectVal+1;
+              chan[i].delayOrder=whatOrder;
+              chan[i].delayRow=whatRow;
+              if (effectVal==nextSpeed) {
+                //if (sysOfChan[i]!=DIV_SYSTEM_YM2610 && sysOfChan[i]!=DIV_SYSTEM_YM2610_EXT) chan[i].delayLocked=true;
+              } else {
+                chan[i].delayLocked=false;
+              }
+              returnAfterPre=true;
+            } else {
+              chan[i].delayLocked=false;
+            }
+          }
+          break;
       }
     }
+    if (returnAfterPre) return;
   }
 
   if (chan[i].delayLocked) return;
@@ -386,24 +413,6 @@ void DivEngine::processRow(int i, bool afterDelay) {
 
     // per-system effect
     if (!perSystemEffect(i,effect,effectVal)) switch (effect) {
-      case 0x09: // speed 1
-        if (effectVal>0) speed1=effectVal;
-        break;
-      case 0x0f: // speed 2
-        if (effectVal>0) speed2=effectVal;
-        break;
-      case 0x0b: // change order
-        if (changeOrd==-1) {
-          changeOrd=effectVal;
-          changePos=0;
-        }
-        break;
-      case 0x0d: // next order
-        if (changeOrd<0 && (curOrder<(song.ordersLen-1) || !song.ignoreJumpAtEnd)) {
-          changeOrd=-2;
-          changePos=effectVal;
-        }
-        break;
       case 0x08: // panning (split 4-bit)
         chan[i].panL=(effectVal>>4)|(effectVal&0xf0);
         chan[i].panR=(effectVal&15)|((effectVal&15)<<4);