diff --git a/docker/nginx.conf.template b/docker/nginx.conf.template
index 47e8365..90bb145 100644
--- a/docker/nginx.conf.template
+++ b/docker/nginx.conf.template
@@ -24,12 +24,7 @@ server {
     add_header X-XSS-Protection "1; mode=block" always;
     add_header Referrer-Policy "strict-origin-when-cross-origin" always;
 
-    # Handle client-side routing
-    location / {
-        try_files $uri $uri/ /index.html;
-    }
-
-    # Bull Board proxy
+    # Bull Board proxy - must come before the root location to avoid conflicts
     location /bullboard {
         proxy_pass http://${BACKEND_HOST}:${BACKEND_PORT};
         proxy_set_header Host $host;
@@ -52,6 +47,11 @@ server {
         }
     }
 
+    # Handle client-side routing
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+
     # API proxy
     location /api/ {
         proxy_pass http://${BACKEND_HOST}:${BACKEND_PORT};