diff --git a/src/engine/chipUtils.h b/src/engine/chipUtils.h
index d7cef0e28..84e2cf6b2 100644
--- a/src/engine/chipUtils.h
+++ b/src/engine/chipUtils.h
@@ -20,6 +20,7 @@
 #ifndef _CHIP_UTILS_H
 #define _CHIP_UTILS_H
 
+#include "defines.h"
 #include "macroInt.h"
 
 // custom clock limits
@@ -29,7 +30,7 @@
 // common shared channel struct
 template<typename T> struct SharedChannel {
   int freq, baseFreq, baseNoteOverride, pitch, pitch2, arpOff;
-  int ins, note;
+  int ins, note, sampleNote, sampleNoteDelta;
   bool active, insChanged, freqChanged, fixedArp, keyOn, keyOff, portaPause, inPorta;
   T vol, outVol;
   DivMacroInt std;
@@ -71,6 +72,8 @@ template<typename T> struct SharedChannel {
     arpOff(0),
     ins(-1),
     note(0),
+    sampleNote(DIV_NOTE_NULL),
+    sampleNoteDelta(0),
     active(false),
     insChanged(true),
     freqChanged(false),
diff --git a/src/engine/defines.h b/src/engine/defines.h
index 8d9a501db..2b150ed45 100644
--- a/src/engine/defines.h
+++ b/src/engine/defines.h
@@ -36,5 +36,6 @@
 
 // dispatch
 #define DIV_MAX_OUTPUTS 16
+#define DIV_NOTE_NULL 0x7fffffff
 
 #endif
diff --git a/src/engine/dispatch.h b/src/engine/dispatch.h
index d736fcfe0..fd9697375 100644
--- a/src/engine/dispatch.h
+++ b/src/engine/dispatch.h
@@ -25,11 +25,10 @@
 #include "../pch.h"
 #include "config.h"
 #include "chipUtils.h"
+#include "defines.h"
 
 #define ONE_SEMITONE 2200
 
-#define DIV_NOTE_NULL 0x7fffffff
-
 #define addWrite(a,v) regWrites.push_back(DivRegWrite(a,v));
 
 // HOW TO ADD A NEW COMMAND:
diff --git a/src/engine/platform/amiga.cpp b/src/engine/platform/amiga.cpp
index 95c9d49d5..cbf4449fc 100644
--- a/src/engine/platform/amiga.cpp
+++ b/src/engine/platform/amiga.cpp
@@ -383,7 +383,7 @@ void DivPlatformAmiga::tick(bool sysTick) {
       chan[i].handleArp();
     } else if (chan[i].std.arp.had) {
       // TODO: why the off mult? this may be a bug!
-      chan[i].baseFreq=round(off*NOTE_PERIODIC_NOROUND(parent->calcArp(chan[i].note,chan[i].std.arp.val)));
+      chan[i].baseFreq=round(NOTE_PERIODIC_NOROUND(parent->calcArp(chan[i].note,chan[i].std.arp.val)));
       chan[i].freqChanged=true;
     }
     if (chan[i].useWave && chan[i].std.wave.had) {
@@ -580,7 +580,9 @@ int DivPlatformAmiga::dispatch(DivCommand c) {
       } else {
         if (c.value!=DIV_NOTE_NULL) {
           chan[c.chan].sample=ins->amiga.getSample(c.value);
+          chan[c.chan].sampleNote=c.value;
           c.value=ins->amiga.getFreq(c.value);
+          chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
         }
         chan[c.chan].useWave=false;
       }
@@ -657,9 +659,7 @@ int DivPlatformAmiga::dispatch(DivCommand c) {
       chan[c.chan].updateWave=true;
       break;
     case DIV_CMD_NOTE_PORTA: {
-      DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_AMIGA);
-      chan[c.chan].sample=ins->amiga.getSample(c.value2);
-      int destFreq=round(NOTE_PERIODIC_NOROUND(c.value2));
+      int destFreq=round(NOTE_PERIODIC_NOROUND(c.value2+chan[c.chan].sampleNoteDelta));
       bool return2=false;
       if (destFreq>chan[c.chan].baseFreq) {
         chan[c.chan].baseFreq+=c.value;
@@ -682,7 +682,7 @@ int DivPlatformAmiga::dispatch(DivCommand c) {
       break;
     }
     case DIV_CMD_LEGATO: {
-      chan[c.chan].baseFreq=round(NOTE_PERIODIC_NOROUND(c.value+((HACKY_LEGATO_MESS)?(chan[c.chan].std.arp.val):(0))));
+      chan[c.chan].baseFreq=round(NOTE_PERIODIC_NOROUND(c.value+chan[c.chan].sampleNoteDelta+((HACKY_LEGATO_MESS)?(chan[c.chan].std.arp.val):(0))));
       chan[c.chan].freqChanged=true;
       chan[c.chan].note=c.value;
       break;