diff --git a/plugins/chat/app/models/chat_message.rb b/plugins/chat/app/models/chat_message.rb
index 6cbe32377c4..f7688a8a13d 100644
--- a/plugins/chat/app/models/chat_message.rb
+++ b/plugins/chat/app/models/chat_message.rb
@@ -252,5 +252,6 @@ end
 #
 #  idx_chat_messages_by_created_at_not_deleted            (created_at) WHERE (deleted_at IS NULL)
 #  index_chat_messages_on_chat_channel_id_and_created_at  (chat_channel_id,created_at)
+#  index_chat_messages_on_chat_channel_id_and_id          (chat_channel_id,id) WHERE (deleted_at IS NULL)
 #  index_chat_messages_on_last_editor_id                  (last_editor_id)
 #
diff --git a/plugins/chat/db/migrate/20221219082223_add_index_to_chat_messages.rb b/plugins/chat/db/migrate/20221219082223_add_index_to_chat_messages.rb
new file mode 100644
index 00000000000..90a660dc1fb
--- /dev/null
+++ b/plugins/chat/db/migrate/20221219082223_add_index_to_chat_messages.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddIndexToChatMessages < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def change
+    add_index :chat_messages, [:chat_channel_id, :id], where: "deleted_at IS NULL", algorithm: :concurrently
+  end
+end