diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index ae0f5423..84cf109c 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -30,7 +30,6 @@ services:
     environment:
       - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL}
       - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD}
-      - PGADMIN_CONFIG_WTF_CSRF_ENABLED=False
     ports:
       - 5400:80
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 287c5298..cca4a1fc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,6 @@ services:
     environment:
       - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL}
       - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD}
-      - PGADMIN_CONFIG_WTF_CSRF_ENABLED=False
     ports:
       - 5400:80
 
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index d01a8c4e..dcf0a209 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -41,7 +41,10 @@ http {
 	# PgAdmin
         location /pgadmin/ {
             proxy_set_header X-Script-Name /pgadmin;
+            proxy_set_header X-Scheme $scheme;
+            proxy_set_header Host $host;
             proxy_pass http://pgadmin:80/;
+            proxy_redirect off;
         }
 
 	# Admin Frontend