diff --git a/source/native-plugins/midi-base.hpp b/source/native-plugins/midi-base.hpp
index 444189cce..45d1d6895 100644
--- a/source/native-plugins/midi-base.hpp
+++ b/source/native-plugins/midi-base.hpp
@@ -175,6 +175,10 @@ public:
 
         carla_copy<uint8_t>(rawEvent->data, data, size);
 
+        // Fix zero-velocity note-ons
+        if (MIDI_IS_STATUS_NOTE_ON(data[0]) && data[2] == 0)
+            rawEvent->data[0] = MIDI_STATUS_NOTE_OFF;
+
         appendSorted(rawEvent);
     }