diff --git a/src/queue.c b/src/queue.c
index b2d2f676..eb8e3e4c 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -195,7 +195,16 @@ void HandleQueuedReminders(void)
 		DaemonWait(SleepTime);
 	    }
 
-	    if (Daemon> 0 && SleepTime) CheckInitialFile();
+	    /* If not in daemon mode and day has rolled around,
+	       exit -- not much we can do. */
+	    if (!Daemon) {
+		int y, m, d;
+		if (RealToday != SystemDate(&y, &m, &d)) {
+			exit(0);
+		}
+	    }
+
+	    if (Daemon > 0 && SleepTime) CheckInitialFile();
 
 	    if (Daemon && !q) {
 		if (Daemon < 0) {