diff --git a/src/server/web/templates/loading.html b/src/server/web/templates/loading.html
index db155fc..9516a33 100644
--- a/src/server/web/templates/loading.html
+++ b/src/server/web/templates/loading.html
@@ -468,12 +468,43 @@
 
         function showCompletion() {
             isComplete = true;
-            document.getElementById('completionMessage').style.display = 'block';
             document.getElementById('connectionStatus').style.display = 'none';
             
             if (ws) {
                 ws.close();
             }
+            
+            // Check for unresolved folders before showing completion
+            checkUnresolvedAndProceed();
+        }
+
+        async function checkUnresolvedAndProceed() {
+            try {
+                const token = localStorage.getItem('auth_token');
+                if (!token) {
+                    // No token, go to login
+                    document.getElementById('completionMessage').style.display = 'block';
+                    return;
+                }
+                
+                const res = await fetch('/api/setup/unresolved', {
+                    headers: { 'Authorization': `Bearer ${token}` }
+                });
+                
+                if (res.ok) {
+                    const unresolved = await res.json();
+                    if (unresolved && unresolved.length > 0) {
+                        // Has unresolved folders - redirect to unresolved page
+                        window.location.href = '/setup/unresolved';
+                        return;
+                    }
+                }
+            } catch (e) {
+                console.error('Error checking unresolved folders:', e);
+            }
+            
+            // No unresolved folders or error - show completion message
+            document.getElementById('completionMessage').style.display = 'block';
         }
 
         function showError(message) {