diff --git a/config/config.exs b/config/config.exs
index 0c6c5f948..b0c7fdbd2 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -18,8 +18,8 @@ config :phoenix, :json_library, Poison
 config :ask,
   ecto_repos: [Ask.Repo]
 
-if System.get_env("DISABLE_REPO_TIMEOUT") == "true" do
-  config :ask, Ask.Repo, timeout: :infinity
+if System.get_env("DISABLE_TIMEOUTS") == "true" do
+  config :ask, AskWeb.Endpoint, http: [protocol_options: [idle_timeout: :infinity]]
 end
 
 # Configures the endpoint