diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 85def6c56b..1c3a2a0b37 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1877,6 +1877,12 @@ int server_schedule_sync(Server *s, int priority) {
                 return 0;
         }
 
+        if (!s->event || sd_event_get_state(s->event) == SD_EVENT_FINISHED) {
+                /* Shutting down the server? Let's sync immediately. */
+                server_sync(s);
+                return 0;
+        }
+
         if (s->sync_scheduled)
                 return 0;