diff --git a/lib/endo/adapters/postgres.ex b/lib/endo/adapters/postgres.ex
index d5be26c..4e33d3f 100644
--- a/lib/endo/adapters/postgres.ex
+++ b/lib/endo/adapters/postgres.ex
@@ -42,8 +42,8 @@ defmodule Endo.Adapters.Postgres do
 
     opts
     |> Table.query()
-    |> repo.all()
-    |> Task.async_stream(&(&1 |> repo.preload(preloads) |> derive_preloads.()))
+    |> repo.all(timeout: :timer.minutes(2))
+    |> Task.async_stream(&(&1 |> repo.preload(preloads) |> derive_preloads.()), timeout: :timer.minutes(2))
     |> Enum.map(fn {:ok, %Table{} = table} -> table end)
   end
 
diff --git a/mix.exs b/mix.exs
index ca0610d..abeced7 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Endo.MixProject do
   def project do
     [
       app: :endo,
-      version: "0.1.20",
+      version: "0.1.21",
       elixir: "~> 1.13",
       start_permanent: Mix.env() == :prod,
       deps: deps(),