diff --git a/WerksverkaufScanner/WerksverkaufScanner/Pages/Inventur/InventurScan.razor b/WerksverkaufScanner/WerksverkaufScanner/Pages/Inventur/InventurScan.razor
index 506cec4..cc63079 100644
--- a/WerksverkaufScanner/WerksverkaufScanner/Pages/Inventur/InventurScan.razor
+++ b/WerksverkaufScanner/WerksverkaufScanner/Pages/Inventur/InventurScan.razor
@@ -108,26 +108,43 @@ else
     // JS-Interop nur after first render (sonst Prerender-Fehler)
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        if (firstRender)
-        {
-            await LoadConfigAsync();
 
-            // Erst fokussieren, wenn Setup ok
-            if (!needsSetup && focusBarcode)
+        var s = firstRender.ToString();
+
+        try
+        {
+            var f = await JS.InvokeAsync<string?>("localStorage.getItem", "scannerpilot.filialId");
+            var i = await JS.InvokeAsync<string?>("localStorage.getItem", "scannerpilot.inventurId");
+
+            if (!String.IsNullOrWhiteSpace(f) || !String.IsNullOrWhiteSpace(i))
             {
-                focusBarcode = false;
-                await barcodeRef.FocusAsync();
+                await LoadConfigAsync();
+
+                if (focusBarcode)
+                {
+                    focusBarcode = false;
+                    await barcodeRef.FocusAsync();
+                }
+
+                if (focusMenge)
+                {
+                    focusMenge = false;
+                    await mengeRef.FocusAsync();
+                }
+            }
+            else
+            {
+                needsSetup = true;
             }
 
-            StateHasChanged(); // UI nach Konfig-Check aktualisieren
-            return;
+        }
+        catch
+        {
+            needsSetup = true;
+            filialId = null;
+            inventurId = null;
         }
 
-        if (!needsSetup && focusMenge)
-        {
-            focusMenge = false;
-            await mengeRef.FocusAsync();
-        }
     }
 
     private async Task LoadConfigAsync()