diff --git a/app/models/submission.rb b/app/models/submission.rb
index 353af713..663bea8b 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -22,7 +22,7 @@
 #
 # Indexes
 #
-#  index_submissions_on_account_id          (account_id)
+#  index_submissions_on_account_id_and_id   (account_id,id)
 #  index_submissions_on_created_by_user_id  (created_by_user_id)
 #  index_submissions_on_slug                (slug) UNIQUE
 #  index_submissions_on_template_id         (template_id)
diff --git a/db/migrate/20240816075917_update_submission_account_id_index.rb b/db/migrate/20240816075917_update_submission_account_id_index.rb
new file mode 100644
index 00000000..65c5205b
--- /dev/null
+++ b/db/migrate/20240816075917_update_submission_account_id_index.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class UpdateSubmissionAccountIdIndex < ActiveRecord::Migration[7.1]
+  def change
+    add_index :submissions, %i[account_id id]
+    remove_index :submissions, :account_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 08f49832..61891a35 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_08_16_072859) do
+ActiveRecord::Schema[7.1].define(version: 2024_08_16_075917) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -219,7 +219,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_08_16_072859) do
     t.text "preferences", null: false
     t.bigint "account_id", null: false
     t.datetime "expire_at"
-    t.index ["account_id"], name: "index_submissions_on_account_id"
+    t.index ["account_id", "id"], name: "index_submissions_on_account_id_and_id"
     t.index ["created_by_user_id"], name: "index_submissions_on_created_by_user_id"
     t.index ["slug"], name: "index_submissions_on_slug", unique: true
     t.index ["template_id"], name: "index_submissions_on_template_id"