diff --git a/plugins/chat/db/migrate/20221107034541_make_chat_editor_ids_not_null.rb b/plugins/chat/db/migrate/20221107034541_make_chat_editor_ids_not_null.rb
index 5dc971d0119..04fd6c79bd6 100644
--- a/plugins/chat/db/migrate/20221107034541_make_chat_editor_ids_not_null.rb
+++ b/plugins/chat/db/migrate/20221107034541_make_chat_editor_ids_not_null.rb
@@ -2,6 +2,14 @@
 
 class MakeChatEditorIdsNotNull < ActiveRecord::Migration[7.0]
   def change
+    DB.exec("UPDATE chat_messages SET last_editor_id = user_id")
+    DB.exec(<<~SQL)
+      UPDATE chat_message_revisions cmr
+      SET user_id = cm.user_id
+      FROM chat_messages AS cm
+      WHERE cmr.chat_message_id = cm.id
+    SQL
+
     change_column_null :chat_messages, :last_editor_id, false
     change_column_null :chat_message_revisions, :user_id, false
   end
diff --git a/plugins/chat/db/post_migrate/20221101071135_backfill_editing_user_ids_for_chat_messages_and_revisions.rb b/plugins/chat/db/post_migrate/20221101071135_backfill_editing_user_ids_for_chat_messages_and_revisions.rb
deleted file mode 100644
index 01a736844e9..00000000000
--- a/plugins/chat/db/post_migrate/20221101071135_backfill_editing_user_ids_for_chat_messages_and_revisions.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class BackfillEditingUserIdsForChatMessagesAndRevisions < ActiveRecord::Migration[7.0]
-  def up
-    DB.exec("UPDATE chat_messages SET last_editor_id = user_id")
-    DB.exec(<<~SQL)
-      UPDATE chat_message_revisions cmr
-      SET user_id = cm.user_id
-      FROM chat_messages AS cm
-      WHERE cmr.chat_message_id = cm.id
-    SQL
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-end