diff --git a/etc/apache2/pandora.conf b/etc/apache2/pandora.conf
index d2903f7b..a7ef38bf 100644
--- a/etc/apache2/pandora.conf
+++ b/etc/apache2/pandora.conf
@@ -28,6 +28,8 @@
     ProxyPass /data !
     ProxyPass /.bzr !
 
+    RequestHeader unset Proxy
+
     Alias /.bzr        /srv/pandora/.bzr
     Alias /static      /srv/pandora/static
     Alias /favicon.ico /srv/pandora/static/favicon.ico
diff --git a/etc/nginx/pandora b/etc/nginx/pandora
index ad7541ff..2c64e496 100644
--- a/etc/nginx/pandora
+++ b/etc/nginx/pandora
@@ -39,6 +39,7 @@ server {
             proxy_set_header Host $http_host;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";
+            proxy_set_header Proxy "";
             proxy_redirect off;
             proxy_buffering off;
             proxy_read_timeout 999999999;
@@ -49,6 +50,7 @@ server {
             proxy_set_header X-Forwarded-For $remote_addr;
             proxy_set_header X-Forwarded-Proto http;
             proxy_set_header Host $http_host;
+            proxy_set_header Proxy "";
             proxy_redirect off;
             proxy_buffering off;
             proxy_read_timeout 90;    #should be in sync with gunicorn timeout