diff --git a/CHANGELOG.md b/CHANGELOG.md
index db039b5..51c0d69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Added missing indices on crawls and crawl_interactions tables.
+
 ### Security
 
 ## [2.6.0 - 2019-08-10]
diff --git a/backend/priv/repo/migrations/20190810123317_add_crawls_index.exs b/backend/priv/repo/migrations/20190810123317_add_crawls_index.exs
new file mode 100644
index 0000000..2905f42
--- /dev/null
+++ b/backend/priv/repo/migrations/20190810123317_add_crawls_index.exs
@@ -0,0 +1,9 @@
+defmodule Backend.Repo.Migrations.AddCrawlsIndex do
+  use Ecto.Migration
+
+  def change do
+    create index(:crawls, [:instance_domain])
+    create index(:crawl_interactions, [:source_domain])
+    create index(:crawl_interactions, [:target_domain])
+  end
+end