From b735c7692088c820e28f2aad80cf3a51d793d951 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Wed, 6 May 2026 11:52:17 -0500
Subject: [PATCH] fix enabled camera state switch after adding via wizard

Cameras added mid-session have no WS state until the dispatcher publishes camera_activity (which only happens on a fresh onConnect). Fall back to the config's enabled value so the switch reflects reality immediately after the wizard closes.
---
 web/src/views/settings/CameraManagementView.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/src/views/settings/CameraManagementView.tsx b/web/src/views/settings/CameraManagementView.tsx
index c4cbc67c5..157f3d158 100644
--- a/web/src/views/settings/CameraManagementView.tsx
+++ b/web/src/views/settings/CameraManagementView.tsx
@@ -313,12 +313,18 @@ type CameraEnableSwitchProps = {
 function CameraEnableSwitch({ cameraName }: CameraEnableSwitchProps) {
   const { payload: enabledState, send: sendEnabled } =
     useEnabledState(cameraName);
+  const { data: config } = useSWR<FrigateConfig>("config");
+
+  const isChecked =
+    enabledState === "ON" || enabledState === "OFF"
+      ? enabledState === "ON"
+      : (config?.cameras?.[cameraName]?.enabled ?? false);
 
   return (
     <div className="flex flex-row items-center">
       <Switch
         id={`camera-enabled-${cameraName}`}
-        checked={enabledState === "ON"}
+        checked={isChecked}
         onCheckedChange={(isChecked) => {
           sendEnabled(isChecked ? "ON" : "OFF");
         }}