diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/ProtocolBufferHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/ProtocolBufferHandler.java
index f2dbf82e0..c609a5125 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/ProtocolBufferHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/ProtocolBufferHandler.java
@@ -138,6 +138,7 @@ public class ProtocolBufferHandler implements MessageHandler {
 
             if (protobufFragment.totalLength <= (statusMessage.getDataOffset() + maxChunkSize)) {
                 chunkedFragmentsMap.remove(protobufFragment);
+                return null;
             }
 
             return protobufFragment.getNextChunk(statusMessage);