diff --git a/frigate/app.py b/frigate/app.py
index 74d3f2f58..596abed72 100644
--- a/frigate/app.py
+++ b/frigate/app.py
@@ -667,6 +667,14 @@ class FrigateApp:
         logger.info("Stopping...")
         self.stop_event.set()
 
+        # set an end_time on entries without an end_time before exiting
+        Event.update(end_time=datetime.datetime.now().timestamp()).where(
+            Event.end_time == None
+        ).execute()
+        ReviewSegment.update(end_time=datetime.datetime.now().timestamp()).where(
+            ReviewSegment.end_time == None
+        ).execute()
+
         # Stop Communicators
         self.inter_process_communicator.stop()
         self.inter_config_updater.stop()
diff --git a/frigate/events/maintainer.py b/frigate/events/maintainer.py
index e6f66edc3..78f67770e 100644
--- a/frigate/events/maintainer.py
+++ b/frigate/events/maintainer.py
@@ -112,10 +112,6 @@ class EventProcessor(threading.Thread):
 
                 self.handle_external_detection(event_type, event_data)
 
-        # set an end_time on events without an end_time before exiting
-        Event.update(end_time=datetime.datetime.now().timestamp()).where(
-            Event.end_time == None
-        ).execute()
         self.event_receiver.stop()
         self.event_end_publisher.stop()
         logger.info("Exiting event processor...")