diff --git a/src/application/io/analog/Analog.h b/src/application/io/analog/Analog.h
index 10a651e06..319e02040 100644
--- a/src/application/io/analog/Analog.h
+++ b/src/application/io/analog/Analog.h
@@ -56,6 +56,7 @@ namespace io
             NRPN_14BIT,
             PITCH_BEND,
             CONTROL_CHANGE_14BIT,
+            RESERVED,
             AMOUNT
         };
 
@@ -137,14 +138,15 @@ namespace io
         uint8_t _fsrPressed[Collection::SIZE() / 8 + 1] = {};
 
         static constexpr MIDI::messageType_t INTERNAL_MSG_TO_MIDI_TYPE[static_cast<uint8_t>(type_t::AMOUNT)] = {
-            MIDI::messageType_t::CONTROL_CHANGE,
-            MIDI::messageType_t::NOTE_ON,
-            MIDI::messageType_t::NOTE_ON,    // fsr: set to off when appropriate
-            MIDI::messageType_t::INVALID,    // button: let other listeners handle this
-            MIDI::messageType_t::NRPN_7BIT,
-            MIDI::messageType_t::NRPN_14BIT,
-            MIDI::messageType_t::PITCH_BEND,
-            MIDI::messageType_t::CONTROL_CHANGE_14BIT,
+            MIDI::messageType_t::CONTROL_CHANGE,          // POTENTIOMETER_CONTROL_CHANGE
+            MIDI::messageType_t::NOTE_ON,                 // POTENTIOMETER_NOTE
+            MIDI::messageType_t::NOTE_ON,                 // FSR (set to note off when appropriate)
+            MIDI::messageType_t::INVALID,                 // BUTTON (let other listeners handle this)
+            MIDI::messageType_t::NRPN_7BIT,               // NRPN_7BIT
+            MIDI::messageType_t::NRPN_14BIT,              // NRPN_14BIT
+            MIDI::messageType_t::PITCH_BEND,              // PITCH_BEND
+            MIDI::messageType_t::CONTROL_CHANGE_14BIT,    // CONTROL_CHANGE_14BIT
+            MIDI::messageType_t::INVALID,                 // RESERVED
         };
     };
 }    // namespace io
diff --git a/src/application/io/analog/stub/Analog.h b/src/application/io/analog/stub/Analog.h
index 0bc19f617..ccc7eb027 100644
--- a/src/application/io/analog/stub/Analog.h
+++ b/src/application/io/analog/stub/Analog.h
@@ -45,6 +45,7 @@ namespace io
             NRPN_14BIT,
             PITCH_BEND,
             CONTROL_CHANGE_14BIT,
+            RESERVED,
             AMOUNT
         };
 
diff --git a/src/application/io/buttons/Buttons.h b/src/application/io/buttons/Buttons.h
index 75a3ac197..0326b61c0 100644
--- a/src/application/io/buttons/Buttons.h
+++ b/src/application/io/buttons/Buttons.h
@@ -83,6 +83,7 @@ namespace io
             MULTI_VAL_INC_DEC_CC,
             NOTE_OFF_ONLY,
             CONTROL_CHANGE0_ONLY,
+            RESERVED,
             PROGRAM_CHANGE_OFFSET_INC,
             PROGRAM_CHANGE_OFFSET_DEC,
             AMOUNT
@@ -175,6 +176,7 @@ namespace io
             MIDI::messageType_t::CONTROL_CHANGE,                  // MULTI_VAL_INC_DEC_CC
             MIDI::messageType_t::NOTE_ON,                         // NOTE_OFF_ONLY
             MIDI::messageType_t::CONTROL_CHANGE,                  // CONTROL_CHANGE0_ONLY
+            MIDI::messageType_t::INVALID,                         // RESERVED
             MIDI::messageType_t::INVALID,                         // PROGRAM_CHANGE_OFFSET_INC
             MIDI::messageType_t::INVALID,                         // PROGRAM_CHANGE_OFFSET_DEC
         };
diff --git a/src/application/io/buttons/stub/Buttons.h b/src/application/io/buttons/stub/Buttons.h
index 91beb6ae8..c15ff9407 100644
--- a/src/application/io/buttons/stub/Buttons.h
+++ b/src/application/io/buttons/stub/Buttons.h
@@ -67,6 +67,7 @@ namespace io
             MULTI_VAL_INC_DEC_CC,
             NOTE_OFF_ONLY,
             CONTROL_CHANGE0_ONLY,
+            RESERVED,
             PROGRAM_CHANGE_OFFSET_INC,
             PROGRAM_CHANGE_OFFSET_DEC,
             AMOUNT
diff --git a/src/application/io/encoders/Encoders.h b/src/application/io/encoders/Encoders.h
index 4b86a4d9e..50080270e 100644
--- a/src/application/io/encoders/Encoders.h
+++ b/src/application/io/encoders/Encoders.h
@@ -54,6 +54,7 @@ namespace io
             NRPN_7BIT,
             NRPN_14BIT,
             CONTROL_CHANGE_14BIT,
+            RESERVED,
             AMOUNT
         };
 
@@ -219,6 +220,7 @@ namespace io
             MIDI::messageType_t::NRPN_7BIT,               // NRPN_7BIT
             MIDI::messageType_t::NRPN_14BIT,              // NRPN_14BIT
             MIDI::messageType_t::CONTROL_CHANGE_14BIT,    // CONTROL_CHANGE_14BIT
+            MIDI::messageType_t::INVALID,                 // RESERVED
         };
     };
 }    // namespace io
diff --git a/src/application/io/encoders/stub/Encoders.h b/src/application/io/encoders/stub/Encoders.h
index abe67447d..8ebbca7b7 100644
--- a/src/application/io/encoders/stub/Encoders.h
+++ b/src/application/io/encoders/stub/Encoders.h
@@ -40,6 +40,7 @@ namespace io
             NRPN_7BIT,
             NRPN_14BIT,
             CONTROL_CHANGE_14BIT,
+            RESERVED,
             AMOUNT
         };