diff --git a/app/models/tag_user.rb b/app/models/tag_user.rb
index 04993eef4ad..f91ad7ffb48 100644
--- a/app/models/tag_user.rb
+++ b/app/models/tag_user.rb
@@ -259,6 +259,7 @@ end
 #
 # Indexes
 #
-#  idx_tag_users_ix1  (user_id,tag_id,notification_level) UNIQUE
-#  idx_tag_users_ix2  (tag_id,user_id,notification_level) UNIQUE
+#  index_tag_users_on_tag_id_and_user_id_and_notification_level  (tag_id,user_id,notification_level)
+#  index_tag_users_on_user_id_and_tag_id                         (user_id,tag_id) UNIQUE
+#  index_tag_users_on_user_id_and_tag_id_and_notification_level  (user_id,tag_id,notification_level)
 #
diff --git a/db/migrate/20240829083823_ensure_unique_tag_user_notification_level.rb b/db/migrate/20240829083823_ensure_unique_tag_user_notification_level.rb
new file mode 100644
index 00000000000..72f976ebd90
--- /dev/null
+++ b/db/migrate/20240829083823_ensure_unique_tag_user_notification_level.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class EnsureUniqueTagUserNotificationLevel < ActiveRecord::Migration[7.1]
+  def up
+    execute <<-SQL
+      DELETE FROM tag_users
+      USING tag_users AS dupe
+      WHERE tag_users.id > dupe.id
+      AND tag_users.user_id = dupe.user_id
+      AND tag_users.tag_id = dupe.tag_id;
+    SQL
+
+    add_index :tag_users, %i[user_id tag_id], unique: true
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20240829142639_remove_unique_constraint_from_tag_users_indexes.rb b/db/migrate/20240829142639_remove_unique_constraint_from_tag_users_indexes.rb
new file mode 100644
index 00000000000..22795fc7d03
--- /dev/null
+++ b/db/migrate/20240829142639_remove_unique_constraint_from_tag_users_indexes.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+class RemoveUniqueConstraintFromTagUsersIndexes < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def up
+    remove_index :tag_users, name: :idx_tag_users_ix1, algorithm: :concurrently
+    remove_index :tag_users, name: :idx_tag_users_ix2, algorithm: :concurrently
+
+    add_index :tag_users, %i[user_id tag_id notification_level], algorithm: :concurrently
+    add_index :tag_users, %i[tag_id user_id notification_level], algorithm: :concurrently
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/spec/fabricators/tag_user_fabricator.rb b/spec/fabricators/tag_user_fabricator.rb
new file mode 100644
index 00000000000..038da79a3f8
--- /dev/null
+++ b/spec/fabricators/tag_user_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:tag_user) do
+  user
+  tag
+  notification_level { TagUser.notification_levels[:tracking] }
+end