diff --git a/frigate/app.py b/frigate/app.py
index a48634eea..b2eac50db 100644
--- a/frigate/app.py
+++ b/frigate/app.py
@@ -128,7 +128,7 @@ class FrigateApp:
         # Queues for clip processing
         self.event_queue = mp.Queue()
         self.event_processed_queue = mp.Queue()
-        self.video_output_queue = mp.Queue()
+        self.video_output_queue = mp.Queue(maxsize=len(self.config.cameras.keys()) * 2)
 
         # Queue for cameras to push tracked objects to
         self.detected_frames_queue = mp.Queue(
diff --git a/frigate/object_processing.py b/frigate/object_processing.py
index 4d259b49c..348f049ca 100644
--- a/frigate/object_processing.py
+++ b/frigate/object_processing.py
@@ -719,7 +719,6 @@ class TrackedObjectProcessor(threading.Thread):
                 frame_time, current_tracked_objects, motion_boxes, regions
             )
 
-            # TODO: should this queue have a max length?
             self.video_output_queue.put(
                 (
                     camera,