diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
index c7ac146b5..cf3af7d4c 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
@@ -43,7 +43,7 @@ public class ApOkHttpUrlLoader implements ModelLoader<GlideUrl, InputStream> {
             if (internalClient == null) {
                 synchronized (Factory.class) {
                     if (internalClient == null) {
-                        internalClient = AntennapodHttpClient.getHttpClient();
+                        internalClient = AntennapodHttpClient.newHttpClient();
                         internalClient.interceptors().add(new NetworkAllowanceInterceptor());
                         internalClient.interceptors().add(new BasicAuthenticationInterceptor());
                     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
index 402a7a8bd..9aff7489b 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
@@ -1,5 +1,6 @@
 package de.danoeh.antennapod.core.service.download;
 
+import android.support.annotation.NonNull;
 import android.os.Build;
 import android.util.Log;
 
@@ -39,35 +40,46 @@ public class AntennapodHttpClient {
     public static synchronized OkHttpClient getHttpClient() {
         if (httpClient == null) {
 
-            if (BuildConfig.DEBUG) Log.d(TAG, "Creating new instance of HTTP client");
-
-            System.setProperty("http.maxConnections", String.valueOf(MAX_CONNECTIONS));
-
-            OkHttpClient client = new OkHttpClient();
-
-            // set cookie handler
-            CookieManager cm = new CookieManager();
-            cm.setCookiePolicy(CookiePolicy.ACCEPT_ORIGINAL_SERVER);
-            client.setCookieHandler(cm);
-
-            // set timeouts
-            client.setConnectTimeout(CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS);
-            client.setReadTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS);
-            client.setWriteTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS);
-
-            // configure redirects
-            client.setFollowRedirects(true);
-            client.setFollowSslRedirects(true);
-
-            if(16 <= Build.VERSION.SDK_INT && Build.VERSION.SDK_INT < 21) {
-                client.setSslSocketFactory(new CustomSslSocketFactory());
-            }
-
-            httpClient = client;
+            httpClient = newHttpClient();
         }
         return httpClient;
     }
 
+    /**
+     * Creates a new HTTP client.  Most users should just use
+     * getHttpClient() to get the standard AntennaPod client,
+     * but sometimes it's necessary for others to have their own
+     * copy so that the clients don't share state.
+     * @return http client
+     */
+    @NonNull
+    public static OkHttpClient newHttpClient() {
+        Log.d(TAG, "Creating new instance of HTTP client");
+
+        System.setProperty("http.maxConnections", String.valueOf(MAX_CONNECTIONS));
+
+        OkHttpClient client = new OkHttpClient();
+
+        // set cookie handler
+        CookieManager cm = new CookieManager();
+        cm.setCookiePolicy(CookiePolicy.ACCEPT_ORIGINAL_SERVER);
+        client.setCookieHandler(cm);
+
+        // set timeouts
+        client.setConnectTimeout(CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS);
+        client.setReadTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS);
+        client.setWriteTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS);
+
+        // configure redirects
+        client.setFollowRedirects(true);
+        client.setFollowSslRedirects(true);
+
+        if(16 <= Build.VERSION.SDK_INT && Build.VERSION.SDK_INT < 21) {
+            client.setSslSocketFactory(new CustomSslSocketFactory());
+        }
+        return client;
+    }
+
     /**
      * Closes expired connections. This method should be called by the using class once has finished its work with
      * the HTTP client.