diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/messages/FitSession.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/messages/FitSession.java
index 1f1484fdb1..0fa5bd5a94 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/messages/FitSession.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/messages/FitSession.java
@@ -1918,6 +1918,12 @@ public class FitSession extends RecordData {
 
     public List<ActivityPoint> toActivityPoints() {
         final List<ActivityPoint> activityPoints = new ArrayList<ActivityPoint>();
+
+        if(getComputedTimestamp() == null) {
+            // some sessions - especially from Strava, have no time stamp
+            return activityPoints;
+        }
+
         final ActivityPoint startActivityPoint = new ActivityPoint();
         startActivityPoint.setTime(new Date(getComputedTimestamp() * 1000L));
         if (getStartLatitude() != null && getStartLongitude() != null) {