diff --git a/migrations/2024-01-25-151400_remove_auto_resolve_report_trigger/down.sql b/migrations/2024-01-25-151400_remove_auto_resolve_report_trigger/down.sql
new file mode 100644
index 000000000..101fe441c
--- /dev/null
+++ b/migrations/2024-01-25-151400_remove_auto_resolve_report_trigger/down.sql
@@ -0,0 +1,48 @@
+-- Automatically resolve all reports for a given post once it is marked as removed
+CREATE OR REPLACE FUNCTION post_removed_resolve_reports ()
+    RETURNS TRIGGER
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+    UPDATE
+        post_report
+    SET
+        resolved = TRUE,
+        resolver_id = NEW.mod_person_id,
+        updated = now()
+    WHERE
+        post_report.post_id = NEW.post_id;
+    RETURN NULL;
+END
+$$;
+
+CREATE OR REPLACE TRIGGER post_removed_resolve_reports
+    AFTER INSERT ON mod_remove_post
+    FOR EACH ROW
+    WHEN (NEW.removed)
+    EXECUTE PROCEDURE post_removed_resolve_reports ();
+
+-- Same when comment is marked as removed
+CREATE OR REPLACE FUNCTION comment_removed_resolve_reports ()
+    RETURNS TRIGGER
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+    UPDATE
+        comment_report
+    SET
+        resolved = TRUE,
+        resolver_id = NEW.mod_person_id,
+        updated = now()
+    WHERE
+        comment_report.comment_id = NEW.comment_id;
+    RETURN NULL;
+END
+$$;
+
+CREATE OR REPLACE TRIGGER comment_removed_resolve_reports
+    AFTER INSERT ON mod_remove_comment
+    FOR EACH ROW
+    WHEN (NEW.removed)
+    EXECUTE PROCEDURE comment_removed_resolve_reports ();
+
diff --git a/migrations/2024-01-25-151400_remove_auto_resolve_report_trigger/up.sql b/migrations/2024-01-25-151400_remove_auto_resolve_report_trigger/up.sql
new file mode 100644
index 000000000..9ac63024e
--- /dev/null
+++ b/migrations/2024-01-25-151400_remove_auto_resolve_report_trigger/up.sql
@@ -0,0 +1,7 @@
+DROP TRIGGER IF EXISTS post_removed_resolve_reports ON mod_remove_post;
+
+DROP FUNCTION IF EXISTS post_removed_resolve_reports;
+
+DROP TRIGGER IF EXISTS comment_removed_resolve_reports ON mod_remove_comment;
+
+DROP FUNCTION IF EXISTS comment_removed_resolve_reports;