diff --git a/RetroCade_Sketch/RetroCade_Sketch.ino b/RetroCade_Sketch/RetroCade_Sketch.ino
index f0eee3d..1dd68c7 100644
--- a/RetroCade_Sketch/RetroCade_Sketch.ino
+++ b/RetroCade_Sketch/RetroCade_Sketch.ino
@@ -266,6 +266,8 @@ void HandlePitchBend(byte channel, int bend) {
 }
 
 void HandleNoteOn(byte channel, byte pitch, byte velocity) {
+  if ( velocity == 0 )
+    return HandleNoteOff(channel, pitch, velocity);
   #ifdef DEBUG
     Serial.print("Note Received: ");
     Serial.println(pitch);
@@ -361,4 +363,4 @@ void loop(){
   retrocade.handleJoystick();     
 }
 
-
+