diff --git a/src/main/scala/gitbucket/core/util/HttpClientUtil.scala b/src/main/scala/gitbucket/core/util/HttpClientUtil.scala
index 3e89400..b01d435 100644
--- a/src/main/scala/gitbucket/core/util/HttpClientUtil.scala
+++ b/src/main/scala/gitbucket/core/util/HttpClientUtil.scala
@@ -11,8 +11,9 @@
     val builder = HttpClientBuilder.create.useSystemProperties
 
     proxy.foreach { proxy =>
+      builder.setProxy(new HttpHost(proxy.host, proxy.port))
+
       for (user <- proxy.user; password <- proxy.password) {
-        builder.setProxy(new HttpHost(proxy.host, proxy.port))
         val credential = new BasicCredentialsProvider()
         credential.setCredentials(
           new AuthScope(proxy.host, proxy.port),