diff --git a/lib/pleroma/utils.ex b/lib/pleroma/utils.ex
index bc0c95332..5e2fa8bf7 100644
--- a/lib/pleroma/utils.ex
+++ b/lib/pleroma/utils.ex
@@ -63,4 +63,13 @@ def posix_error_message(code) when code in @posix_error_codes do
   end
 
   def posix_error_message(_), do: ""
+
+  def query_timeout do
+    {parent, _, _, _} = Process.info(self(), :current_stacktrace) |> elem(1) |> Enum.fetch!(2)
+
+    cond do
+      parent |> to_string |> String.starts_with?("Elixir.Mix.Task") -> [timeout: :infinity]
+      true -> [timeout: 15_000]
+    end
+  end
 end