diff --git a/src/Nginx/ConfigWriter.php b/src/Nginx/ConfigWriter.php
index d09dbf845..f2a4e3f50 100644
--- a/src/Nginx/ConfigWriter.php
+++ b/src/Nginx/ConfigWriter.php
@@ -35,13 +35,11 @@ final class ConfigWriter implements EventSubscriberInterface
         }
 
         $listenBaseUrl = CustomUrls::getListenUrl($station);
-
         $port = $station->getFrontendConfig()->getPort();
 
         $event->appendBlock(
             <<<NGINX
-            # Reverse proxy the frontend broadcast.
-            location ~ ^{$listenBaseUrl}(/?)(.*)\$ {
+            location ~ ^({$listenBaseUrl}|/radio/{$port})(/?)(.*)\$ {
                 include proxy_params;
                 
                 proxy_intercept_errors    on;
@@ -50,7 +48,7 @@ final class ConfigWriter implements EventSubscriberInterface
                 proxy_connect_timeout     60;
                 
                 proxy_set_header Host localhost:{$port};
-                proxy_pass http://127.0.0.1:{$port}/\$2?\$args;
+                proxy_pass http://127.0.0.1:{$port}/\$3?\$args;
             }
             NGINX
         );
@@ -72,10 +70,10 @@ final class ConfigWriter implements EventSubscriberInterface
         $event->appendBlock(
             <<<NGINX
             # Reverse proxy the WebDJ connection.
-            location ~ ^{$webDjBaseUrl}(/?)(.*)\$ {
+            location ~ ^({$webDjBaseUrl}|/radio/{$autoDjPort})(/?)(.*)\$ {
                 include proxy_params;
 
-                proxy_pass http://127.0.0.1:{$autoDjPort}/$2;
+                proxy_pass http://127.0.0.1:{$autoDjPort}/$3;
             }
             NGINX
         );
diff --git a/update.sh b/update.sh
index f80a88899..9676b2e51 100755
--- a/update.sh
+++ b/update.sh
@@ -34,7 +34,7 @@ else
 fi
 
 APP_ENV="${APP_ENV:-production}"
-UPDATE_REVISION="${UPDATE_REVISION:-88}"
+UPDATE_REVISION="${UPDATE_REVISION:-89}"
 
 echo "Updating AzuraCast (Environment: $APP_ENV, Update revision: $UPDATE_REVISION)"
 
diff --git a/util/ansible/roles/nginx/templates/default.j2 b/util/ansible/roles/nginx/templates/default.j2
index 42f65652c..1bdf327b1 100644
--- a/util/ansible/roles/nginx/templates/default.j2
+++ b/util/ansible/roles/nginx/templates/default.j2
@@ -131,25 +131,6 @@ server {
         internal;
     }
 
-    # Reverse proxy all possible radio listening ports (8000, 8010...8480, 8490)
-    location ~ ^/radio/(8[0-4][0-9]0)(/?)(.*)$ {
-        proxy_buffering           off;
-        proxy_ignore_client_abort off;
-        proxy_intercept_errors    on;
-        proxy_next_upstream       error timeout invalid_header;
-        proxy_redirect            off;
-        proxy_connect_timeout     60;
-        proxy_send_timeout        21600;
-        proxy_read_timeout        21600;
-
-        proxy_set_header Host localhost:$1;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $remote_addr;
-
-        proxy_pass http://127.0.0.1:$1/$3?$args;
-    }
-
     # pub/sub endpoints
     location ~ /api/live/nowplaying/([^\/]+)$ {
         nchan_subscriber;
@@ -164,7 +145,6 @@ server {
 
     # deny access to .htaccess files, if Apache's document root
     # concurs with nginx's one
-    #
     location ~ /\.ht {
         deny all;
     }
diff --git a/util/ansible/update.yml b/util/ansible/update.yml
index ca8b00f3e..93b6144b1 100644
--- a/util/ansible/update.yml
+++ b/util/ansible/update.yml
@@ -28,7 +28,7 @@
       when: update_revision|int < 87
 
     - role: "nginx"
-      when: update_revision|int < 88
+      when: update_revision|int < 89
 
     - role: "redis"
       when: update_revision|int < 87
diff --git a/util/docker/web/nginx/azuracast.conf.tmpl b/util/docker/web/nginx/azuracast.conf.tmpl
index f38042cf7..424e09951 100644
--- a/util/docker/web/nginx/azuracast.conf.tmpl
+++ b/util/docker/web/nginx/azuracast.conf.tmpl
@@ -137,23 +137,6 @@ server {
         return 404;
     }
 
-    # Reverse proxy all possible radio listening ports (8000, 8010...8480, 8490)
-{{ if eq .Env.NGINX_RADIO_PORTS "default" }}
-    location ~ ^/radio/(8[0-9][0-9]0)(/?)(.*)$ {
-{{ else }}
-    location ~ ^/radio/{{ .Env.NGINX_RADIO_PORTS }}(/?)(.*)$ {
-{{ end }}
-        include proxy_params;
-
-        proxy_intercept_errors    on;
-        proxy_next_upstream       error timeout invalid_header;
-        proxy_redirect            off;
-        proxy_connect_timeout     60;
-
-        proxy_set_header Host localhost:$1;
-        proxy_pass http://127.0.0.1:$1/$3?$args;
-    }
-
     # pub/sub endpoints
     location ~ /api/live/nowplaying/([^\/]+)$ {
         nchan_access_control_allow_origin "*";