diff --git a/db/migrate/20131130190411_add_creator_id_and_post_id_indexes_to_comments_and_notes.rb b/db/migrate/20131130190411_add_creator_id_and_post_id_indexes_to_comments_and_notes.rb
new file mode 100644
index 000000000..990cd9b4b
--- /dev/null
+++ b/db/migrate/20131130190411_add_creator_id_and_post_id_indexes_to_comments_and_notes.rb
@@ -0,0 +1,17 @@
+class AddCreatorIdAndPostIdIndexesToCommentsAndNotes < ActiveRecord::Migration
+  def self.up
+    execute "set statement_timeout = 0"
+    remove_index :comments, :creator_id
+    remove_index :notes, :creator_id
+    add_index :comments, [:creator_id, :post_id]
+    add_index :notes, [:creator_id, :post_id]
+  end
+
+  def self.down
+    execute "set statement_timeout = 0"
+    remove_index :comments, [:creator_id, :post_id]
+    remove_index :notes, [:creator_id, :post_id]
+    add_index :comments, :creator_id
+    add_index :notes, :creator_id
+  end
+end