diff --git a/lib/mobilizon/storage/page.ex b/lib/mobilizon/storage/page.ex
index 43b9ebc5b..29f14f651 100644
--- a/lib/mobilizon/storage/page.ex
+++ b/lib/mobilizon/storage/page.ex
@@ -31,7 +31,7 @@ defmodule Mobilizon.Storage.Page do
         fn -> Repo.all(paginate(query, page, limit)) end
       ]
       |> Enum.map(&Task.async/1)
-      |> Enum.map(&Task.await/1)
+      |> Enum.map(&Task.await(&1, 15_000))
 
     %__MODULE__{total: total, elements: elements}
   end