diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/useCheckboxState.ts b/webapp/packages/core-blocks/src/FormControls/Checkboxes/useCheckboxState.ts
index ed78f3ac21..2231d59d3e 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/useCheckboxState.ts
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/useCheckboxState.ts
@@ -58,7 +58,7 @@ export function useCheckboxState<TKey extends string>(options: CheckboxStateOpti
         checked = !!currentState;
       }
     } else {
-      checked = false;
+      checked = checked ?? false;
     }
   }
 
diff --git a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx
index d8aa15dae7..73bdb45519 100644
--- a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx
+++ b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx
@@ -45,6 +45,10 @@ function getValue(value: any, controlType: ObjectPropertyType) {
     return checkbox ? false : '';
   }
 
+  if (typeof value === 'boolean') {
+    return checkbox ? value : String(value);
+  }
+
   if (typeof value === 'string') {
     return checkbox ? value.toLowerCase() === 'true' : value;
   }