diff --git a/db/migrations/postgres/000079_add_messages_data_newindexes.down.sql b/db/migrations/postgres/000079_add_messages_data_newindexes.down.sql
new file mode 100644
index 0000000000..fd7b37cdd8
--- /dev/null
+++ b/db/migrations/postgres/000079_add_messages_data_newindexes.down.sql
@@ -0,0 +1,8 @@
+BEGIN;
+
+DROP INDEX messages_data_message;
+DROP INDEX messages_data_data;
+
+CREATE UNIQUE INDEX messages_data_idx ON messages_data(message_id, data_id);
+
+COMMIT;
diff --git a/db/migrations/postgres/000079_add_messages_data_newindexes.up.sql b/db/migrations/postgres/000079_add_messages_data_newindexes.up.sql
new file mode 100644
index 0000000000..947c134c5f
--- /dev/null
+++ b/db/migrations/postgres/000079_add_messages_data_newindexes.up.sql
@@ -0,0 +1,8 @@
+BEGIN;
+
+DROP INDEX messages_data_idx;
+
+CREATE INDEX messages_data_message ON messages_data(message_id);
+CREATE INDEX messages_data_data ON messages_data(data_id);
+
+COMMIT;
diff --git a/db/migrations/sqlite/000079_add_messages_data_newindexes.down.sql b/db/migrations/sqlite/000079_add_messages_data_newindexes.down.sql
new file mode 100644
index 0000000000..5769e90a89
--- /dev/null
+++ b/db/migrations/sqlite/000079_add_messages_data_newindexes.down.sql
@@ -0,0 +1,4 @@
+DROP INDEX messages_data_message;
+DROP INDEX messages_data_data;
+
+CREATE UNIQUE INDEX messages_data_idx ON messages_data(message_id, data_id);
diff --git a/db/migrations/sqlite/000079_add_messages_data_newindexes.up.sql b/db/migrations/sqlite/000079_add_messages_data_newindexes.up.sql
new file mode 100644
index 0000000000..02cc61c70c
--- /dev/null
+++ b/db/migrations/sqlite/000079_add_messages_data_newindexes.up.sql
@@ -0,0 +1,4 @@
+DROP INDEX messages_data_idx;
+
+CREATE INDEX messages_data_message ON messages_data(message_id);
+CREATE INDEX messages_data_data ON messages_data(data_id);