diff --git a/src/main/java/se/michaelthelin/spotify/SpotifyHttpManager.java b/src/main/java/se/michaelthelin/spotify/SpotifyHttpManager.java
index aeee5b5b6..deaf04320 100644
--- a/src/main/java/se/michaelthelin/spotify/SpotifyHttpManager.java
+++ b/src/main/java/se/michaelthelin/spotify/SpotifyHttpManager.java
@@ -68,7 +68,7 @@ public SpotifyHttpManager(Builder builder) {
 
     BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
 
-    if (proxy != null) {
+    if (proxy != null && proxyCredentials != null) {
       credentialsProvider.setCredentials(
         new AuthScope(null, proxy.getHostName(), proxy.getPort(), null, proxy.getSchemeName()),
         proxyCredentials