diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78156ca..6a1a8ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fixed error when viewing some uncrawlable instances
 - Fix navbar z-index
+- Optimize query used for generating status rate
 
 ### Security
 
diff --git a/backend/lib/backend/scheduler.ex b/backend/lib/backend/scheduler.ex
index 2496803..82cd4d4 100644
--- a/backend/lib/backend/scheduler.ex
+++ b/backend/lib/backend/scheduler.ex
@@ -96,23 +96,24 @@ defmodule Backend.Scheduler do
       })
 
     instances =
-      Crawl
-      |> join(:inner, [c], c2 in subquery(earliest_crawl_subquery),
-        on: c.instance_domain == c2.instance_domain
+      Instance
+      |> join(:inner, [i], c in Crawl, on: i.domain == c.instance_domain)
+      |> join(:inner, [i], c2 in subquery(earliest_crawl_subquery),
+        on: i.domain == c2.instance_domain
       )
       |> where(
-        [c, c2],
-        c.inserted_at > c2.earliest_crawl and not is_nil(c.statuses_seen)
+        [i, c, c2],
+        c.inserted_at > c2.earliest_crawl and c.statuses_seen > 0
       )
-      |> select([c], %{
-        instance_domain: c.instance_domain,
+      |> select([i, c], %{
+        domain: i.domain,
         status_count: sum(c.statuses_seen),
         second_earliest_crawl: min(c.inserted_at)
       })
-      |> group_by([c], c.instance_domain)
+      |> group_by([i], i.domain)
       |> Repo.all(timeout: :infinity)
       |> Enum.map(fn %{
-                       instance_domain: domain,
+                       domain: domain,
                        status_count: status_count,
                        second_earliest_crawl: oldest_timestamp
                      } ->