diff --git a/examples/SysEx_Send/SysEx_Send.ino b/examples/SysEx_Send/SysEx_Send.ino
new file mode 100644
index 0000000..14b51e0
--- /dev/null
+++ b/examples/SysEx_Send/SysEx_Send.ino
@@ -0,0 +1,88 @@
+#include <BLEMIDI.h>
+
+#include <hardware/BLEMIDI_ESP32_NimBLE.h>
+//#include <hardware/BLEMIDI_ESP32.h>
+//#include <hardware/BLEMIDI_nRF52.h>
+//#include <hardware/BLEMIDI_ArduinoBLE.h>
+
+byte sysex4[]  = { 0xF0, 0x43, 0x20, 0xF7 };
+byte sysex5[]  = { 0xF0, 0x43, 0x20, 0x7E, 0xF7 };
+byte sysex6[]  = { 0xF0, 0x43, 0x20, 0x7E, 0x4C, 0xF7 };
+byte sysex7[]  = { 0xF0, 0x43, 0x20, 0x7E, 0x4C, 0x4D, 0xF7 };
+byte sysex8[]  = { 0xF0, 0x43, 0x20, 0x7E, 0x4C, 0x4D, 0x20, 0xF7 };
+byte sysex9[]  = { 0xF0, 0x43, 0x20, 0x7E, 0x4C, 0x4D, 0x20, 0x20, 0xF7 };
+byte sysex10[] = { 0xF0, 0x43, 0x20, 0x7E, 0x4C, 0x4D, 0x20, 0x20, 0x38, 0xF7 };
+byte sysex11[] = { 0xF0, 0x43, 0x20, 0x7E, 0x4C, 0x4D, 0x20, 0x20, 0x38, 0x39, 0xF7 };
+byte sysex12[] = { 0xF0, 0x43, 0x20, 0x7E, 0x4C, 0x4D, 0x20, 0x20, 0x38, 0x39, 0x37, 0xF7 };
+byte sysex13[] = { 0xF0, 0x43, 0x20, 0x7E, 0x4C, 0x4D, 0x20, 0x20, 0x38, 0x39, 0x37, 0x33, 0xF7 };
+byte sysex14[] = { 0xF0, 0x43, 0x20, 0x7E, 0x4C, 0x4D, 0x20, 0x20, 0x38, 0x39, 0x37, 0x33, 0x50, 0xF7 };
+byte sysex15[] = { 0xF0, 0x43, 0x20, 0x7E, 0x4C, 0x4D, 0x20, 0x20, 0x38, 0x39, 0x37, 0x33, 0x50, 0x4D, 0xF7 };
+byte sysex16[] = { 0xF0, 0x43, 0x20, 0x7E, 0x4C, 0x4D, 0x20, 0x20, 0x38, 0x39, 0x37, 0x33, 0x32, 0x50, 0x4D, 0xF7 };
+byte sysexBig[] = { 0xF0, 0x41,
+                    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29,
+                    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+                    0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
+                    0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
+                    0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
+                    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
+                    0x7a,
+
+                    0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+                    0xF7
+                  };
+
+BLEMIDI_CREATE_DEFAULT_INSTANCE()
+
+unsigned long t0 = millis();
+bool isConnected = false;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void setup()
+{
+  MIDI.begin();
+
+  pinMode(LED_BUILTIN, OUTPUT);
+  digitalWrite(LED_BUILTIN, LOW);
+
+  BLEMIDI.setHandleConnected(OnConnected);
+  BLEMIDI.setHandleDisconnected(OnDisconnected);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void loop()
+{
+  // Listen to incoming notes
+  MIDI.read();
+
+  if (isConnected && (millis() - t0) > 1000)
+  {
+    t0 = millis();
+
+    MIDI.sendNoteOn (60, 100, 1); // note 60, velocity 127 on channel 1
+    MIDI.sendSysEx(sizeof(sysex11), sysex11, true);
+  }
+}
+
+// ====================================================================================
+// Event handlers for incoming MIDI messages
+// ====================================================================================
+
+// -----------------------------------------------------------------------------
+// Device connected
+// -----------------------------------------------------------------------------
+void OnConnected() {
+  isConnected = true;
+  digitalWrite(LED_BUILTIN, HIGH);
+}
+
+// -----------------------------------------------------------------------------
+// Device disconnected
+// -----------------------------------------------------------------------------
+void OnDisconnected() {
+  isConnected = false;
+  digitalWrite(LED_BUILTIN, LOW);
+}
diff --git a/src/BLEMIDI.h b/src/BLEMIDI.h
index 2e2f1f4..e757bd2 100644
--- a/src/BLEMIDI.h
+++ b/src/BLEMIDI.h
@@ -64,6 +64,11 @@ public:
             // if we approach the end of the buffer, chop-up in segments until
             // we reach F7 (end of SysEx)
         }
+
+        if (inData == MidiType::SystemExclusiveEnd)
+        {
+            mTxBuffer[mTxIndex++] = mTxBuffer[1];
+        }
         
         mTxBuffer[mTxIndex++] = inData;
     }