diff --git a/conf/nginx.conf b/conf/nginx.conf
index 4193bce..551a5fa 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,13 +1,28 @@
-location ^~ __PATH__/ {
-  proxy_pass        http://127.0.0.1:__PORT__;
-  proxy_redirect    off;
-  proxy_set_header  Host $host;
-  proxy_set_header  X-Real-IP $remote_addr;
-  proxy_set_header  X-Forwarded-Proto $scheme;
-  proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
-  proxy_set_header  X-Forwarded-Host $server_name;
-  
-  proxy_http_version 1.1;
-  proxy_set_header Upgrade $http_upgrade;
-  proxy_set_header Connection "upgrade";
-}
\ No newline at end of file
+location / {
+        try_files $uri $uri/ =404;
+}
+
+    ########
+    ## Jellyfin
+
+    location /jellyfin {
+        return 302 $scheme://$host/jellyfin/;
+}
+
+    location /jellyfin/ {
+        # Proxy main Jellyfin traffic
+        # The / at the end is significant.
+        proxy_pass http://127.0.0.1:__PORT__/;
+
+        proxy_pass_request_headers on;
+
+        proxy_set_header Host $host;
+
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-Host $http_host;
+
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $http_connection;
+}