diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/FitImporter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/FitImporter.java
index 4d712e679b..8b47366293 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/FitImporter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/FitImporter.java
@@ -309,6 +309,9 @@ public class FitImporter {
                 if (event.getEvent() == null) {
                     LOG.warn("Event in {} is null", event);
                     continue;
+                } else if (ts == null) {
+                    LOG.warn("Timestamp for {} is null", event);
+                    continue;
                 }
 
                 LOG.trace("Event at {}: {}", ts, event);