diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/fieldDefinitions/FieldDefinitionCoordinate.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/fieldDefinitions/FieldDefinitionCoordinate.java
index dd2705f69..31d17871b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/fieldDefinitions/FieldDefinitionCoordinate.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/fieldDefinitions/FieldDefinitionCoordinate.java
@@ -15,7 +15,11 @@ public class FieldDefinitionCoordinate extends FieldDefinition {
 
     @Override
     public Object decode(ByteBuffer byteBuffer) {
-        return ((long) baseType.decode(byteBuffer, 1, 0)) * conversionFactor;
+        final Object rawValue = baseType.decode(byteBuffer, 1, 0);
+        if (rawValue == null) {
+            return null;
+        }
+        return ((long) rawValue) * conversionFactor;
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/messages/FitRecord.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/messages/FitRecord.java
index 4a89bb250..a43038542 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/messages/FitRecord.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/messages/FitRecord.java
@@ -84,7 +84,7 @@ public class FitRecord extends RecordData {
 
     public ActivityPoint toActivityPoint() {
         final ActivityPoint activityPoint = new ActivityPoint();
-        activityPoint.setTime(new Date(getComputedTimestamp()));
+        activityPoint.setTime(new Date(getComputedTimestamp() * 1000L));
         if (getLatitude() != null && getLongitude() != null) {
             activityPoint.setLocation(new GPSCoordinate(
                     getLongitude(),