diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/messages/GFDIMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/messages/GFDIMessage.java
index 82e0c511f..422c076ab 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/messages/GFDIMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/messages/GFDIMessage.java
@@ -46,7 +46,10 @@ public abstract class GFDIMessage {
     public static GFDIMessage parseIncoming(byte[] message) {
         final MessageReader messageReader = new MessageReader(message);
 
-        final int messageType = messageReader.readShort();
+        int messageType = messageReader.readShort();
+        if (messageType > 0x8000) {
+            messageType = (messageType & 0xff) + 5000;
+        }
         try {
             final GarminMessage garminMessage = GarminMessage.fromId(messageType);
             if (garminMessage == null) {