diff --git a/apps/admin-ui/src/components/key-value-form/KeyValueInput.tsx b/apps/admin-ui/src/components/key-value-form/KeyValueInput.tsx
index 683edaeb77..77c48995bf 100644
--- a/apps/admin-ui/src/components/key-value-form/KeyValueInput.tsx
+++ b/apps/admin-ui/src/components/key-value-form/KeyValueInput.tsx
@@ -32,7 +32,8 @@ export const KeyValueInput = ({ name }: KeyValueInputProps) => {
   });
 
   const isValid = watchFields.every(
-    ({ key, value }) => key.trim().length !== 0 && value.trim().length !== 0
+    ({ key, value }) =>
+      key && key.trim().length !== 0 && value && value.trim().length !== 0
   );
 
   useEffect(() => {