diff --git a/src/main/java/com/auth0/client/auth/AuthAPI.java b/src/main/java/com/auth0/client/auth/AuthAPI.java
index 07e7eb5f..e9842ef9 100644
--- a/src/main/java/com/auth0/client/auth/AuthAPI.java
+++ b/src/main/java/com/auth0/client/auth/AuthAPI.java
@@ -933,7 +933,7 @@ public static class Builder {
         private final String domain;
         private final String clientId;
         private final String clientSecret;
-        private Auth0HttpClient httpClient = DefaultHttpClient.newBuilder().build();
+        private Auth0HttpClient httpClient;
 
         /**
          * Create a new Builder
@@ -969,7 +969,8 @@ public Builder withHttpClient(Auth0HttpClient httpClient) {
          * @return the configured {@code AuthAPI} instance.
          */
         public AuthAPI build() {
-            return new AuthAPI(domain, clientId, clientSecret, httpClient);
+            return new AuthAPI(domain, clientId, clientSecret,
+                Objects.nonNull(httpClient) ? httpClient : DefaultHttpClient.newBuilder().build());
         }
     }
 }