diff --git a/frigate/events/cleanup.py b/frigate/events/cleanup.py
index 793e01293..2427ec6ca 100644
--- a/frigate/events/cleanup.py
+++ b/frigate/events/cleanup.py
@@ -83,7 +83,10 @@ class EventCleanup(threading.Thread):
                 datetime.datetime.now() - datetime.timedelta(days=expire_days)
             ).timestamp()
             # grab all events after specific time
-            expired_events = Event.select().where(
+            expired_events = Event.select(
+                Event.id,
+                Event.camera,
+            ).where(
                 Event.camera.not_in(self.camera_keys),
                 Event.start_time < expire_after,
                 Event.label == event.label,
diff --git a/frigate/record/cleanup.py b/frigate/record/cleanup.py
index cb312b6fd..8a388ce55 100644
--- a/frigate/record/cleanup.py
+++ b/frigate/record/cleanup.py
@@ -89,7 +89,10 @@ class RecordingCleanup(threading.Thread):
 
             # Get all the events to check against
             events: Event = (
-                Event.select()
+                Event.select(
+                    Event.start_time,
+                    Event.end_time,
+                )
                 .where(
                     Event.camera == camera,
                     # need to ensure segments for all events starting
@@ -109,7 +112,7 @@ class RecordingCleanup(threading.Thread):
                 keep = False
                 # Now look for a reason to keep this recording segment
                 for idx in range(event_start, len(events)):
-                    event = events[idx]
+                    event: Event = events[idx]
 
                     # if the event starts in the future, stop checking events
                     # and let this recording segment expire