diff --git a/db/post_migrate/20240924234448_remove_faulty_async_index_definitions.rb b/db/post_migrate/20240924234448_remove_faulty_async_index_definitions.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7d1acf37d7ce346251fca0ef82bbb071a08f6e29
--- /dev/null
+++ b/db/post_migrate/20240924234448_remove_faulty_async_index_definitions.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class RemoveFaultyAsyncIndexDefinitions < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+
+  def up
+    unprepare_async_index_by_name :merge_request_diff_commits_b5377a7a34,
+      :index_merge_request_diff_commits_b5377a7a34_on_project_id
+    unprepare_async_index_by_name :merge_request_diff_files_99208b8fac,
+      :index_merge_request_diff_files_99208b8fac_on_project_id
+  end
+
+  def down
+    # no-op
+  end
+end
diff --git a/db/schema_migrations/20240924234448 b/db/schema_migrations/20240924234448
new file mode 100644
index 0000000000000000000000000000000000000000..d7bbe91b516197af1c8577631bcd038f9c582fdd
--- /dev/null
+++ b/db/schema_migrations/20240924234448
@@ -0,0 +1 @@
+dca955fb2f25ca3e40cdf2a4fe195a27bc53a1134eb172ecbe6b436fdc888ca0
\ No newline at end of file