diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index c97065a5..c4a7649e 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -115,16 +115,23 @@ if ($http_referer ~* /plex/) {
     rewrite ^/web/(.*) /plex/web/$1? redirect;
   }
 
-location /tautulli {
+location /tautulli/ {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass http://192.168.31.26:8181/;
-    proxy_set_header Host $http_host;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $host;
     proxy_set_header X-Forwarded-Host $server_name;
-    proxy_set_header X-Forwarded-Proto https;
     proxy_set_header X-Real-IP $remote_addr;
-  }
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_read_timeout 90;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    set $xforwardedssl "off";
+    if ($scheme = https) {
+            set $xforwardedssl "on";
+    }
+    proxy_set_header X-Forwarded-Ssl $xforwardedssl;
+    proxy_redirect ~^(http(?:s)?://)([^:/]+)(?::\d+)?(/.*)?$ $1$2:$server_port$3;
+}
 
 location /ombi {
     auth_request /auth-4;