diff --git a/frigate/events/maintainer.py b/frigate/events/maintainer.py
index 8ae3e5e85..898218ef0 100644
--- a/frigate/events/maintainer.py
+++ b/frigate/events/maintainer.py
@@ -217,11 +217,14 @@ class EventProcessor(threading.Thread):
                 Event.end_time: event_data["end_time"],
             }
 
-        (
-            Event.insert(event)
-            .on_conflict(
-                conflict_target=[Event.id],
-                update=event,
+        try:
+            (
+                Event.insert(event)
+                .on_conflict(
+                    conflict_target=[Event.id],
+                    update=event,
+                )
+                .execute()
             )
-            .execute()
-        )
+        except Exception:
+            logger.warning(f"Failed to update manual event: {event_data['id']}")
diff --git a/frigate/http.py b/frigate/http.py
index 9de68f398..b9f273d32 100644
--- a/frigate/http.py
+++ b/frigate/http.py
@@ -889,7 +889,6 @@ def create_event(camera_name, label):
 def end_event(event_id):
     try:
         current_app.external_processor.finish_manual_event(event_id)
-        # TODO we need some way to verify that the event id is valid, just check in the db?
     except:
         return jsonify(
             {"success": False, "message": f"{event_id} must be set and valid."}, 404