diff --git a/web/src/admin.ts b/web/src/admin.ts
index 2165c06..d9754ef 100644
--- a/web/src/admin.ts
+++ b/web/src/admin.ts
@@ -213,8 +213,7 @@ function pollScanProgress(
 ): void {
   const token = localStorage.getItem("token");
   const startTime = Date.now();
-
-  const interval = setInterval(async () => {
+  scanPollInterval = setInterval(async () => {
     let allComplete = true;
     let totalProgress = 0;
     let totalFiles = 0;
@@ -264,7 +263,7 @@ function pollScanProgress(
     }
 
     if (allComplete) {
-      clearInterval(interval);
+      clearInterval(scanPollInterval);
       showScanResults(
         jobIds.length,
         totalFiles,
@@ -352,11 +351,65 @@ async function loadWatchStatus(): Promise<void> {
 
 document.addEventListener("DOMContentLoaded", function () {
   loadWatchStatus();
+  connectScanWebSocket();
 });
 
+let scanPollInterval: ReturnType<typeof setInterval> | undefined = undefined;
+let scanWs: WebSocket | null = null;
+function connectScanWebSocket(): void {
+  const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
+  const wsUrl = `${protocol}//${window.location.host}/api/ws`;
+
+  scanWs = new WebSocket(wsUrl);
+
+  scanWs.onmessage = (event) => {
+    const message = JSON.parse(event.data);
+
+    switch (message.type) {
+      case "scan_progress":
+        updateScanProgress(message.data);
+        break;
+      case "scan_complete":
+        showScanComplete(message.data);
+        stopScanStatusPolling(); // Optional: stop HTTP polling
+        break;
+      case "scan_error":
+        showScanError(message.data);
+        break;
+    }
+  };
+}
+function updateScanProgress(data: any): void {
+  // Update progress bar
+  const progressBar = document.getElementById(
+    "scan-progress-bar",
+  ) as HTMLElement;
+  if (progressBar) {
+    progressBar.style.width = `${data.progress * 100}%`;
+  }
+
+  // Update text
+  const progressText = document.getElementById("scan-progress-text");
+  if (progressText) {
+    progressText.textContent = `${data.files_scanned} files scanned (${data.new_items} new)`;
+  }
+}
+function showScanComplete(data: any): void {
+  console.log("Scan complete:", data);
+}
+function showScanError(data: any): void {
+  console.error("Scan error:", data);
+}
+function stopScanStatusPolling(): void {
+  if (scanPollInterval !== undefined) {
+    clearInterval(scanPollInterval);
+    scanPollInterval = undefined;
+  }
+}
 (window as any).triggerLibraryScan = triggerLibraryScan;
 (window as any).triggerQuickScan = triggerQuickScan;
 (window as any).loadSystemStats = loadSystemStats;
 (window as any).scanAllLibraries = scanAllLibraries;
 (window as any).loadWatchStatus = loadWatchStatus;
 (window as any).hideScanProgress = hideScanProgress;
+(window as any).stopScanStatusPolling = stopScanStatusPolling;