diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBAlarm.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBAlarm.java
index 466f5634b..0ba743731 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBAlarm.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBAlarm.java
@@ -121,9 +121,15 @@ public class GBAlarm implements Parcelable, Comparable {
     }
 
     public Calendar getAlarmCal() {
+
         Calendar alarm = Calendar.getInstance();
+        Calendar now = Calendar.getInstance();
         alarm.set(Calendar.HOUR_OF_DAY, this.hour);
         alarm.set(Calendar.MINUTE, this.minute);
+        if (now.after(alarm) && repetition == ALARM_ONCE) {
+            //if the alarm is in the past set it to tomorrow
+            alarm.add(Calendar.DATE, 1);
+        }
         return alarm;
     }