diff --git a/src/engine/platform/pokey.cpp b/src/engine/platform/pokey.cpp
index ae4b311e..8ee3a169 100644
--- a/src/engine/platform/pokey.cpp
+++ b/src/engine/platform/pokey.cpp
@@ -156,7 +156,7 @@ void DivPlatformPOKEY::tick(bool sysTick) {
 
   for (int i=0; i<4; i++) {
     if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) {
-      chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,chan[i].fixedArp?chan[i].baseNoteOverride:chan[i].arpOff,chan[i].fixedArp,true,0,chan[i].pitch2,chipClock,CHIP_DIVIDER);
+      chan[i].freq=parent->calcFreq(chan[i].baseFreq,parent->song.linearPitch?chan[i].pitch:0,chan[i].fixedArp?chan[i].baseNoteOverride:chan[i].arpOff,chan[i].fixedArp,true,0,parent->song.linearPitch?chan[i].pitch2:0,chipClock,CHIP_DIVIDER);
 
       if ((i==0 && !(audctl&64)) || (i==2 && !(audctl&32)) || i==1 || i==3) {
         chan[i].freq/=7;
@@ -194,6 +194,11 @@ void DivPlatformPOKEY::tick(bool sysTick) {
         chan[i].freq>>=2;
       }
 
+      // non-linear pitch
+      if (parent->song.linearPitch==0) {
+        chan[i].freq-=chan[i].pitch;
+      }
+
       if (--chan[i].freq<0) chan[i].freq=0;
 
       // snap buzz periods