diff --git a/immich/httpd.conf-cm.yml b/immich/httpd.conf-cm.yml
index 2901e6a..4cb0aea 100644
--- a/immich/httpd.conf-cm.yml
+++ b/immich/httpd.conf-cm.yml
@@ -75,10 +75,6 @@ data:
       Require all granted
     </Location>
 
-    <Location "/api/v1/ws">
-      AuthType None
-      Require all granted
-    </Location>
 
     <Location "/static">
       AuthType None
@@ -88,19 +84,22 @@ data:
     AllowEncodedSlashes NoDecode
     ProxyPreserveHost Off
 
-    RewriteEngine on
-    RewriteCond %{REQUEST_URI}  ^/socket.io            [NC]
-    RewriteCond %{QUERY_STRING} transport=websocket    [NC]
+    # RewriteEngine on
+    # RewriteCond %{REQUEST_URI}  ^/socket.io            [NC]
+    # RewriteCond %{QUERY_STRING} transport=websocket    [NC]
     # RewriteRule ^/api/socket.io/(.*)           wss://helm-immich-server:2283/$1 [P,L]
 
-    ProxyPass /api/socket.io/ wss://helm-immich-server:2283/api/socket.io/
-    ProxyPassReverse /api/socket.io/ wss://helm-immich-server:2283/api/socket.io/
+    # ProxyPass /api/socket.io/ wss://helm-immich-server:2283/api/socket.io/
+    # ProxyPassReverse /api/socket.io/ wss://helm-immich-server:2283/api/socket.io/
     ProxyPass / http://helm-immich-server:2283/
     ProxyPassReverse / http://helm-immich-server:2283/
-    # <Location "/api/socket.io/">
-    #   ProxyPass wss://helm-immich-server:2283/api/socket.io/
-    #   ProxyPassReverse wss://helm-immich-server:2283/api/socket.io/
-    # </Location>
+    RewriteEngine on
+    RewriteCond %{HTTP:Upgrade} websocket [NC]
+    RewriteCond %{HTTP:Connection} upgrade [NC]
+    RewriteRule ^/?(.*) "ws://localhost:3000/$1" [P,L]
+
+    # must be bigger than pingInterval (25s by default) + pingTimeout (20s by default)
+    ProxyTimeout 60
     ProxyRequests off
 
     Header always set Access-Control-Allow-Origin "*"