diff --git a/app/src/main/java/org/schabi/newpipe/DownloaderImpl.java b/app/src/main/java/org/schabi/newpipe/DownloaderImpl.java
index 8048a9f1d..9ae9fffe6 100644
--- a/app/src/main/java/org/schabi/newpipe/DownloaderImpl.java
+++ b/app/src/main/java/org/schabi/newpipe/DownloaderImpl.java
@@ -57,10 +57,16 @@ public final class DownloaderImpl extends Downloader {
                 App.getApp().getString(R.string.proxy_address_key), "192.168.1.1");
             final String proxyPortStr = sharedPreferences.getString(
                 App.getApp().getString(R.string.proxy_port_key), "1080");
+            final String proxyTypeStr = sharedPreferences.getString(
+                App.getApp().getString(R.string.proxy_type_key), "socks");
+            final Proxy.Type proxyType = "http".equalsIgnoreCase(proxyTypeStr)
+                ? Proxy.Type.HTTP
+                : Proxy.Type.SOCKS;
             final int proxyPort = Integer.parseInt(proxyPortStr);
             Log.d("DownloaderImpl_ProxySettings",
-                "Proxy enabled with address: " + proxyAddress + " and port: " + proxyPort);
-            final Proxy proxy = new Proxy(Proxy.Type.SOCKS,
+                "Proxy enabled with address: " + proxyAddress
+                + " and port: " + proxyPort + ", type: " + proxyType);
+            final Proxy proxy = new Proxy(proxyType,
                 new InetSocketAddress(proxyAddress, proxyPort));
             this.client = builder
                     .proxy(proxy)
diff --git a/app/src/main/java/org/schabi/newpipe/player/datasource/YoutubeHttpDataSource.java b/app/src/main/java/org/schabi/newpipe/player/datasource/YoutubeHttpDataSource.java
index 20efe0488..ce8c64d59 100644
--- a/app/src/main/java/org/schabi/newpipe/player/datasource/YoutubeHttpDataSource.java
+++ b/app/src/main/java/org/schabi/newpipe/player/datasource/YoutubeHttpDataSource.java
@@ -736,10 +736,16 @@ public final class YoutubeHttpDataSource extends BaseDataSource implements HttpD
                 App.getApp().getString(R.string.proxy_address_key), "192.168.1.1");
             final String proxyPortStr = sharedPreferences.getString(
                 App.getApp().getString(R.string.proxy_port_key), "1080");
+            final String proxyTypeStr = sharedPreferences.getString(
+                App.getApp().getString(R.string.proxy_type_key), "socks");
+            final Proxy.Type proxyType = "http".equalsIgnoreCase(proxyTypeStr)
+                ? Proxy.Type.HTTP
+                : Proxy.Type.SOCKS;
             final int proxyPort = Integer.parseInt(proxyPortStr);
             android.util.Log.d("YoutubeHttpDataSource_ProxySettings",
-                "Proxy enabled with address: " + proxyAddress + " and port: " + proxyPort);
-            final Proxy proxy = new Proxy(Proxy.Type.SOCKS,
+                "Proxy enabled with address: "
+                + proxyAddress + " and port: " + proxyPort + ", type: " + proxyType);
+            final Proxy proxy = new Proxy(proxyType,
                 new InetSocketAddress(proxyAddress, proxyPort));
             connection = (HttpURLConnection) url.openConnection(proxy);
         } else {
diff --git a/app/src/main/java/org/schabi/newpipe/util/image/PicassoHelper.java b/app/src/main/java/org/schabi/newpipe/util/image/PicassoHelper.java
index 3fb5111e7..5e3318fc5 100644
--- a/app/src/main/java/org/schabi/newpipe/util/image/PicassoHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/image/PicassoHelper.java
@@ -68,10 +68,16 @@ public final class PicassoHelper {
                 context.getString(R.string.proxy_address_key), "192.168.1.1");
             final String proxyPortStr = sharedPreferences.getString(
                 context.getString(R.string.proxy_port_key), "1080");
+            final String proxyTypeStr = sharedPreferences.getString(
+                context.getString(R.string.proxy_type_key), "socks");
+            final Proxy.Type proxyType = "http".equalsIgnoreCase(proxyTypeStr)
+                ? Proxy.Type.HTTP
+                : Proxy.Type.SOCKS;
             final int proxyPort = Integer.parseInt(proxyPortStr);
             Log.d("PicassoHelper_ProxySettings",
-                "Proxy enabled with address: " + proxyAddress + " and port: " + proxyPort);
-            proxySet = new Proxy(Proxy.Type.SOCKS, new InetSocketAddress(proxyAddress, proxyPort));
+                "Proxy enabled with address: "
+                + proxyAddress + " and port: " + proxyPort  + ", type: " + proxyType);
+            proxySet = new Proxy(proxyType, new InetSocketAddress(proxyAddress, proxyPort));
         } else {
             Log.d("PicassoHelper_ProxySettings",
                 "Update called. proxy_enabled_key off: " + isProxyEnabled);