diff --git a/nifi/docker-compose-cluster.yml b/nifi/docker-compose-cluster.yml
index 4dda802..96d3450 100644
--- a/nifi/docker-compose-cluster.yml
+++ b/nifi/docker-compose-cluster.yml
@@ -8,7 +8,6 @@ services:
       - "10000:10000"
     environment:
       - NIFI_WEB_HTTP_PORT=8080
-      - NIFI_WEB_PROXY_CONTEXT_PATH=// # FIX BUG
       - NIFI_CLUSTER_IS_NODE=true
       - NIFI_CLUSTER_NODE_PROTOCOL_PORT=8082
       - NIFI_REMOTE_INPUT_SOCKET_PORT=10000
diff --git a/nifi/docker-compose.yml b/nifi/docker-compose.yml
index d372c84..f4fd094 100644
--- a/nifi/docker-compose.yml
+++ b/nifi/docker-compose.yml
@@ -17,7 +17,6 @@ services:
       - ./data/nifi/logs:/opt/nifi/nifi-current/logs
     environment:
       - NIFI_WEB_HTTP_PORT=8080
-      - NIFI_WEB_PROXY_CONTEXT_PATH=// # FIX BUG
       - NIFI_SENSITIVE_PROPS_KEY=00000000-0000-0000-0000-000000000000
       - NIFI_JVM_HEAP_INIT=8g
       - NIFI_JVM_HEAP_MAX=16g
diff --git a/nifi/nginx.conf b/nifi/nginx.conf
index 42ea32b..acecbc0 100644
--- a/nifi/nginx.conf
+++ b/nifi/nginx.conf
@@ -12,13 +12,10 @@ server {
     ssl_protocols        TLSv1 TLSv1.1 TLSv1.2;
     ssl_ciphers          HIGH:!aNULL:!MD5;
     location / {
-        if ($request_uri ~* "\/\/") {
-          rewrite ^/(.*) $scheme://$host/$1 permanent; # FIXME: squeeze forward slash
-        }
         proxy_set_header X-ProxyScheme https;
         proxy_set_header X-ProxyHost $host;
         proxy_set_header X-ProxyPort 443;
-        proxy_set_header X-ProxyContextPath /;
+        proxy_set_header X-ProxyContextPath "";
         proxy_pass       http://127.0.0.1:8080;
     }
     location /nifi-registry {
@@ -26,7 +23,7 @@ server {
         proxy_set_header X-ProxyScheme https;
         proxy_set_header X-ProxyHost $host;
         proxy_set_header X-ProxyPort 443;
-        proxy_set_header X-ProxyContextPath /;
+        proxy_set_header X-ProxyContextPath "";
         proxy_pass       http://127.0.0.1:18080;
     }
 }