diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java
index 50147b125..b577af466 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java
@@ -89,6 +89,11 @@ public class TimeChangeReceiver extends BroadcastReceiver {
         final ZoneRules zoneRules = zoneId.getRules();
         final Instant now = Instant.now();
         final ZoneOffsetTransition transition = zoneRules.nextTransition(now);
+        if (transition == null) {
+            LOG.warn("No DST transition found for {}", zoneId);
+            return;
+        }
+
         final long nextDstMillis = transition.getInstant().toEpochMilli();
         final long delayMillis = nextDstMillis - now.toEpochMilli() + 5000L;