2 files changed, 10 insertions, 4 deletions
diff --git a/src/components/ble/AlertNotificationClient.cpp b/src/components/ble/AlertNotificationClient.cpp
index cfb3272d..9efede39 100644
--- a/src/components/ble/AlertNotificationClient.cpp
+++ b/src/components/ble/AlertNotificationClient.cpp
@@ -158,8 +158,11 @@ void AlertNotificationClient::OnNotification(ble_gap_event *event) {
     const auto maxMessageSize{NotificationManager::MaximumMessageSize()};
     const auto maxBufferSize{maxMessageSize + headerSize};
 
-    const auto dbgPacketLen = OS_MBUF_PKTLEN(event->notify_rx.om);
-    size_t bufferSize = std::min(dbgPacketLen + stringTerminatorSize, maxBufferSize);
+    // Ignore notifications with empty message
+    const auto packetLen = OS_MBUF_PKTLEN(event->notify_rx.om);
+    if(packetLen <= headerSize) return;
+
+    size_t bufferSize = std::min(packetLen + stringTerminatorSize, maxBufferSize);
     auto messageSize = std::min(maxMessageSize, (bufferSize - headerSize));
 
     NotificationManager::Notification notif;
diff --git a/src/components/ble/AlertNotificationService.cpp b/src/components/ble/AlertNotificationService.cpp
index c3187c1d..d91e2090 100644
--- a/src/components/ble/AlertNotificationService.cpp
+++ b/src/components/ble/AlertNotificationService.cpp
@@ -66,8 +66,11 @@ int AlertNotificationService::OnAlert(uint16_t conn_handle, uint16_t attr_handle
     const auto maxMessageSize {NotificationManager::MaximumMessageSize()};
     const auto maxBufferSize{maxMessageSize + headerSize};
 
-    const auto dbgPacketLen = OS_MBUF_PKTLEN(ctxt->om);
-    size_t bufferSize = std::min(dbgPacketLen + stringTerminatorSize, maxBufferSize);
+    // Ignore notifications with empty message
+    const auto packetLen = OS_MBUF_PKTLEN(ctxt->om);
+    if(packetLen <= headerSize) return 0;
+
+    size_t bufferSize = std::min(packetLen + stringTerminatorSize, maxBufferSize);
     auto messageSize = std::min(maxMessageSize, (bufferSize-headerSize));
     Categories category;