--- linuxsampler/trunk/src/engines/EngineBase.h	2020/01/04 15:04:22	3700
+++ linuxsampler/trunk/src/engines/EngineBase.h	2020/01/04 18:15:04	3701
@@ -1976,6 +1976,9 @@
                     pChannel->GlobalTranspose = transpose;
                     // workaround, so we won't have hanging notes
                     pChannel->ReleaseAllVoices(itRpnEvent);
+                } else if (itRpnEvent->Param.RPN.Parameter == 16383) { // null function RPN
+                    // disable subsequent data entry/increment/decrement processing
+                    pChannel->ResetMidiRpnParameter();
                 }
             }
 
@@ -2027,6 +2030,13 @@
                             pChannel->pMIDIKeyInfo[note].ChorusSend = chorus;
                         break;
                     }
+                    case 0x7f: {
+                        if (itNrpnEvent->Param.NRPN.ParameterLSB() == 0x7f) { // null function NRPN
+                            // disable subsequent data entry/increment/decrement processing
+                            pChannel->ResetMidiNrpnParameter();
+                        }
+                        break;
+                    }
                 }
             }