diff --git a/docker/nginx/entrypoint.sh b/docker/nginx/entrypoint.sh
index 9914a7aae91b79d696d2006ccebf6ef5f8718004..f359f4da98fe8b9f98b64c318aebe6d334ebc686 100755
--- a/docker/nginx/entrypoint.sh
+++ b/docker/nginx/entrypoint.sh
@@ -9,7 +9,7 @@ if [ -n "$COMPOSE_PROJECT_NAME" ]; then
 fi
 echo "Copying template file..."
 cp /etc/nginx/funkwhale_proxy.conf{.template,}
-sed -i "s/X-Forwarded-Host \$host:\$server_port/X-Forwarded-Host ${FUNKWHALE_HOSTNAME}:${FORWARDED_PORT}/" /etc/nginx/funkwhale_proxy.conf
+sed -i "s/X-Forwarded-Host \$host:\$server_port/X-Forwarded-Host ${FUNKWHALE_HOSTNAME}/" /etc/nginx/funkwhale_proxy.conf
 sed -i "s/proxy_set_header Host \$host/proxy_set_header Host ${FUNKWHALE_HOSTNAME}/" /etc/nginx/funkwhale_proxy.conf
 sed -i "s/proxy_set_header X-Forwarded-Port \$server_port/proxy_set_header X-Forwarded-Port ${FORWARDED_PORT}/" /etc/nginx/funkwhale_proxy.conf
 sed -i "s/proxy_set_header X-Forwarded-Proto \$scheme/proxy_set_header X-Forwarded-Proto ${FORWARDED_PROTO}/" /etc/nginx/funkwhale_proxy.conf
diff --git a/docs/upgrading/0.17.rst b/docs/upgrading/0.17.rst
index 3510135112c9570791d86cd6073c1d03f86693fe..4a7093b1fa8024a3e3cb550bc58ded1ae2dada42 100644
--- a/docs/upgrading/0.17.rst
+++ b/docs/upgrading/0.17.rst
@@ -180,6 +180,7 @@ Libraries created this way will have a different visibility level depending of y
 This script will contain other database-related operations, but the impact will remain
 invisible.
 
+
 Upgrade instructions
 --------------------
 
@@ -195,3 +196,15 @@ On non docker-setups::
     python api/manage.py script migrate_to_user_libraries --no-input
 
 If the scripts ends without errors, you're instance should be updated and ready to use :)
+
+.. note::
+
+    If you use nginx, ensure your funkwhale_proxy.conf file does not contain this:
+
+        proxy_set_header X-Forwarded-Host $host:$server_port;
+
+    If you have this line present, replace it with:
+
+        proxy_set_header X-Forwarded-Host $host;
+
+    And reload your nginx server.