diff --git a/src/you_get/common.py b/src/you_get/common.py
index a16b4019..65af9e9a 100644
--- a/src/you_get/common.py
+++ b/src/you_get/common.py
@@ -912,9 +912,15 @@ def script_main(script_name, download, download_playlist = None):
 
     try:
         if stream_id:
-            download_main(download, download_playlist, args, playlist, stream_id=stream_id, output_dir=output_dir, merge=merge, info_only=info_only)
+            if not extractor_proxy:
+                download_main(download, download_playlist, args, playlist, stream_id=stream_id, output_dir=output_dir, merge=merge, info_only=info_only)
+            else:
+                download_main(download, download_playlist, args, playlist, stream_id=stream_id, extractor_proxy=extractor_proxy, output_dir=output_dir, merge=merge, info_only=info_only)
         else:
-            download_main(download, download_playlist, args, playlist, output_dir=output_dir, merge=merge, info_only=info_only)
+            if not extractor_proxy:
+                download_main(download, download_playlist, args, playlist, output_dir=output_dir, merge=merge, info_only=info_only)
+            else:
+                download_main(download, download_playlist, args, playlist, extractor_proxy=extractor_proxy, output_dir=output_dir, merge=merge, info_only=info_only)
     except KeyboardInterrupt:
         if traceback:
             raise
diff --git a/src/you_get/extractor.py b/src/you_get/extractor.py
index 3df4a37c..6f4f8a46 100644
--- a/src/you_get/extractor.py
+++ b/src/you_get/extractor.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from .common import match1, download_urls
+from .common import match1, download_urls, parse_host, set_proxy, unset_proxy
 from .util import log
 
 class Extractor():
@@ -30,9 +30,8 @@ class VideoExtractor():
     def download_by_url(self, url, **kwargs):
         self.url = url
 
-        #global extractor_proxy
-        #if extractor_proxy:
-        #    set_proxy(parse_host(extractor_proxy))
+        if kwargs['extractor_proxy']:
+            set_proxy(parse_host(kwargs['extractor_proxy']))
         self.prepare(**kwargs)
 
         try:
@@ -42,17 +41,16 @@ class VideoExtractor():
 
         self.extract(**kwargs)
 
-        #if extractor_proxy:
-        #    unset_proxy()
+        if kwargs['extractor_proxy']:
+            unset_proxy()
 
         self.download(**kwargs)
 
     def download_by_vid(self, vid, **kwargs):
         self.vid = vid
 
-        #global extractor_proxy
-        #if extractor_proxy:
-        #    set_proxy(parse_host(extractor_proxy))
+        if kwargs['extractor_proxy']:
+            set_proxy(parse_host(kwargs['extractor_proxy']))
         self.prepare(**kwargs)
 
         try:
@@ -61,8 +59,8 @@ class VideoExtractor():
             self.streams_sorted = [dict([('itag', stream_type['itag'])] + list(self.streams[stream_type['itag']].items())) for stream_type in self.__class__.stream_types if stream_type['itag'] in self.streams]
 
         self.extract(**kwargs)
-        #if extractor_proxy:
-        #    unset_proxy()
+        if kwargs['extractor_proxy']:
+            unset_proxy()
 
         self.download(**kwargs)