1 files changed, 6 insertions, 8 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
index c54a0218..0034a82c 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
@@ -694,11 +694,6 @@ public class CalendarOverlay {
                     }
                 }
 
-                if(nextEvent == null) {
-                    nextEvent = firstEvent;
-                    timeUntilNext = timeUntilFirst;
-                }
-
                 if(nextEvent != null) {
                     renderToast(nextEvent, timeUntilNext);
                 }
@@ -883,9 +878,12 @@ public class CalendarOverlay {
                 }
             }
 
-            if(nextEvent == null) {
-                nextEvent = firstEvent;
-                timeUntilNext = timeUntilFirst;
+            if(nextEvent == null && firstEvent != null) {
+                String[] split = firstEvent.id.split(":");
+                if(eventFavourites.contains(split[0])) {
+                    nextEvent = firstEvent;
+                    timeUntilNext = timeUntilFirst;
+                }
             }
 
             if(nextEvent != null) {