diff --git a/frigate/util/builtin.py b/frigate/util/builtin.py
index 134d3d467..b7bfe6f96 100644
--- a/frigate/util/builtin.py
+++ b/frigate/util/builtin.py
@@ -237,7 +237,7 @@ def update_yaml(data, key_path, new_value):
                 temp[key[0]] += [{}] * (key[1] - len(temp[key[0]]) + 1)
             temp = temp[key[0]][key[1]]
         else:
-            if key not in temp:
+            if key not in temp or temp[key] is None:
                 temp[key] = {}
             temp = temp[key]
 
diff --git a/web/src/components/filter/CameraGroupSelector.tsx b/web/src/components/filter/CameraGroupSelector.tsx
index 098d2f419..54320f29a 100644
--- a/web/src/components/filter/CameraGroupSelector.tsx
+++ b/web/src/components/filter/CameraGroupSelector.tsx
@@ -663,6 +663,7 @@ export function CameraGroupEdit({
                 <FormDescription>
                   Select cameras for this group.
                 </FormDescription>
+                <FormMessage />
                 {[
                   ...(birdseyeConfig?.enabled ? ["birdseye"] : []),
                   ...Object.keys(config?.cameras ?? {}),
@@ -680,7 +681,6 @@ export function CameraGroupEdit({
                     />
                   </FormControl>
                 ))}
-                <FormMessage />
               </FormItem>
             )}
           />