diff --git a/pkg/setting/setting_data_proxy.go b/pkg/setting/setting_data_proxy.go
index f86b4089e3e..5dd31676e74 100644
--- a/pkg/setting/setting_data_proxy.go
+++ b/pkg/setting/setting_data_proxy.go
@@ -12,8 +12,8 @@ func readDataProxySettings(iniFile *ini.File, cfg *Cfg) error {
 	dataproxy := iniFile.Section("dataproxy")
 	cfg.SendUserHeader = dataproxy.Key("send_user_header").MustBool(false)
 	cfg.DataProxyLogging = dataproxy.Key("logging").MustBool(false)
-	cfg.DataProxyTimeout = dataproxy.Key("timeout").MustInt(10)
-	cfg.DataProxyDialTimeout = dataproxy.Key("dialTimeout").MustInt(30)
+	cfg.DataProxyTimeout = dataproxy.Key("timeout").MustInt(30)
+	cfg.DataProxyDialTimeout = dataproxy.Key("dialTimeout").MustInt(10)
 	cfg.DataProxyKeepAlive = dataproxy.Key("keep_alive_seconds").MustInt(30)
 	cfg.DataProxyTLSHandshakeTimeout = dataproxy.Key("tls_handshake_timeout_seconds").MustInt(10)
 	cfg.DataProxyExpectContinueTimeout = dataproxy.Key("expect_continue_timeout_seconds").MustInt(1)