diff --git a/setup/db_structure.sql b/setup/db_structure.sql
index c88cd390..10b46f1c 100644
--- a/setup/db_structure.sql
+++ b/setup/db_structure.sql
@@ -346,7 +346,8 @@ CREATE TABLE `aowow_comments` (
   `responseUserId` int(10) unsigned NOT NULL DEFAULT '0',
   `responseBody` text,
   `responseRoles` smallint(5) unsigned NOT NULL DEFAULT '0',
-  UNIQUE KEY `id` (`id`)
+  PRIMARY KEY (`id`),
+  INDEX `type_typeId` (`type`, `typeId`)
 ) ENGINE=MyISAM AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
diff --git a/setup/updates/1436903207_01.sql b/setup/updates/1436903207_01.sql
new file mode 100644
index 00000000..11eacb0f
--- /dev/null
+++ b/setup/updates/1436903207_01.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `aowow_comments`
+    DROP INDEX `id`,
+    ADD PRIMARY KEY (`id`),
+    ADD INDEX `type_typeId` (`type`, `typeId`);