diff --git a/src/engine/engine.h b/src/engine/engine.h
index 9becc9d5f..ce01f2905 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -18,7 +18,7 @@ struct DivChannelState {
   int vibratoDepth, vibratoRate, vibratoPos, vibratoDir, vibratoFine;
   int tremoloDepth, tremoloRate, tremoloPos;
   unsigned char arp, arpStage, arpTicks;
-  bool doNote, legato, portaStop, keyOn;
+  bool doNote, legato, portaStop, keyOn, nowYouCanStop;
 
   DivChannelState():
     note(-1),
@@ -40,7 +40,7 @@ struct DivChannelState {
     arp(0),
     arpStage(-1),
     arpTicks(1),
-    doNote(false), legato(false), portaStop(false), keyOn(false) {}
+    doNote(false), legato(false), portaStop(false), keyOn(false), nowYouCanStop(true) {}
 };
 
 class DivEngine {
diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
index 6d220e3dd..2aca79e23 100644
--- a/src/engine/playback.cpp
+++ b/src/engine/playback.cpp
@@ -222,7 +222,8 @@ void DivEngine::processRow(int i, bool afterDelay) {
         } else {
           chan[i].portaNote=0x00;
           chan[i].portaSpeed=effectVal;
-          chan[i].portaStop=false;
+          chan[i].portaStop=true;
+          chan[i].nowYouCanStop=false;
         }
         break;
       case 0x03: // portamento
@@ -267,11 +268,13 @@ void DivEngine::processRow(int i, bool afterDelay) {
         chan[i].portaNote=chan[i].note+(effectVal&15);
         chan[i].portaSpeed=(effectVal>>4)*4;
         chan[i].portaStop=true;
+        chan[i].nowYouCanStop=false;
         break;
       case 0xe2: // portamento down
         chan[i].portaNote=chan[i].note-(effectVal&15);
         chan[i].portaSpeed=(effectVal>>4)*4;
         chan[i].portaStop=true;
+        chan[i].nowYouCanStop=false;
         break;
       case 0xe3: // vibrato direction
         chan[i].vibratoDir=effectVal;
@@ -305,13 +308,14 @@ void DivEngine::processRow(int i, bool afterDelay) {
     }
     chan[i].doNote=false;
     if (!chan[i].keyOn) {
-      if (chan[i].portaStop) {
+      if (chan[i].portaStop && chan[i].nowYouCanStop) {
         chan[i].portaNote=-1;
         chan[i].portaSpeed=-1;
       }
     }
     chan[i].keyOn=true;
   }
+  chan[i].nowYouCanStop=true;
 
   // post effects
   for (int j=0; j<song.pat[i]->effectRows; j++) {