diff --git a/db/migrations/postgres/000037_add_message_topic_tag_index.down.sql b/db/migrations/postgres/000037_add_message_topic_tag_index.down.sql
new file mode 100644
index 0000000000..4dc56f8b37
--- /dev/null
+++ b/db/migrations/postgres/000037_add_message_topic_tag_index.down.sql
@@ -0,0 +1,3 @@
+BEGIN;
+DROP INDEX messages_topics_tag;
+COMMIT;
diff --git a/db/migrations/postgres/000037_add_message_topic_tag_index.up.sql b/db/migrations/postgres/000037_add_message_topic_tag_index.up.sql
new file mode 100644
index 0000000000..462264a85a
--- /dev/null
+++ b/db/migrations/postgres/000037_add_message_topic_tag_index.up.sql
@@ -0,0 +1,3 @@
+BEGIN;
+CREATE INDEX messages_topics_tag ON messages(namespace,topics,tag);
+COMMIT;
diff --git a/db/migrations/sqlite/000037_add_message_topic_tag_index.down.sql b/db/migrations/sqlite/000037_add_message_topic_tag_index.down.sql
new file mode 100644
index 0000000000..89e413e10a
--- /dev/null
+++ b/db/migrations/sqlite/000037_add_message_topic_tag_index.down.sql
@@ -0,0 +1 @@
+DROP INDEX messages_topics_tag;
diff --git a/db/migrations/sqlite/000037_add_message_topic_tag_index.up.sql b/db/migrations/sqlite/000037_add_message_topic_tag_index.up.sql
new file mode 100644
index 0000000000..e98c548448
--- /dev/null
+++ b/db/migrations/sqlite/000037_add_message_topic_tag_index.up.sql
@@ -0,0 +1 @@
+CREATE INDEX messages_topics_tag ON messages(namespace,topics,tag);