diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/Checkbox.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/Checkbox.tsx
index 6bc6a7cb26..2bbc0d2509 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/Checkbox.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/Checkbox.tsx
@@ -43,6 +43,7 @@ export interface ICheckboxObjectProps<TKey extends string> extends CheckboxInput
   autoHide?: boolean;
   name: TKey;
 }
+
 export interface CheckboxType {
   (props: CheckboxBaseProps & ICheckboxControlledProps): React.ReactElement<any, any> | null;
   <TKey extends string>(props: CheckboxBaseProps & ICheckboxObjectProps<TKey>): React.ReactElement<any, any> | null;
@@ -74,7 +75,7 @@ export const Checkbox: CheckboxType = observer(function Checkbox({
     onChange,
   });
 
-  if (autoHide && !isControlPresented(name, state, defaultChecked)) {
+  if (autoHide && !isControlPresented(name, state)) {
     return null;
   }
 
diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
index 902b38179d..9e2cf2b8bf 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
@@ -27,7 +27,7 @@ export const FieldCheckbox: CheckboxType = function FieldCheckbox({
 }: CheckboxBaseProps & (ICheckboxControlledProps | ICheckboxObjectProps<any>)) {
   const styles = useStyles(baseFormControlStyles, fieldCheckboxStyles);
 
-  if (rest.autoHide && !isControlPresented(rest.name, rest.state, rest.defaultChecked)) {
+  if (rest.autoHide && !isControlPresented(rest.name, rest.state)) {
     return null;
   }
 
diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckboxNew.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckboxNew.tsx
index c84e3f1345..0687244421 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckboxNew.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckboxNew.tsx
@@ -39,7 +39,7 @@ export const FieldCheckboxNew: CheckboxType = function FieldCheckboxNew({
 }: CheckboxBaseProps & (ICheckboxControlledProps | ICheckboxObjectProps<any>)) {
   const styles = useStyles(baseFormControlStylesNew, fieldCheckboxStyles);
 
-  if (rest.autoHide && !isControlPresented(rest.name, rest.state, rest.defaultChecked)) {
+  if (rest.autoHide && !isControlPresented(rest.name, rest.state)) {
     return null;
   }
 
diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.tsx
index a5defe948a..67e3dee19a 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.tsx
@@ -121,7 +121,7 @@ export const Switch: SwitchType = observer(function Switch({
     checkboxState.checked && switchState.checked
   );
 
-  if (autoHide && !isControlPresented(name, state, defaultChecked)) {
+  if (autoHide && !isControlPresented(name, state)) {
     return null;
   }
 
diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/SwitchNew.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/SwitchNew.tsx
index b63929fb60..e3d959ea0d 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/SwitchNew.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/SwitchNew.tsx
@@ -125,7 +125,7 @@ export const SwitchNew: SwitchType = observer(function SwitchNew({
     checkboxState.checked && switchState.checked
   );
 
-  if (autoHide && !isControlPresented(name, state, defaultChecked)) {
+  if (autoHide && !isControlPresented(name, state)) {
     return null;
   }
 
diff --git a/webapp/packages/core-blocks/src/FormControls/InputField.tsx b/webapp/packages/core-blocks/src/FormControls/InputField.tsx
index 1fad732ce0..ef82d0a25e 100644
--- a/webapp/packages/core-blocks/src/FormControls/InputField.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/InputField.tsx
@@ -16,12 +16,11 @@ import { baseFormControlStyles } from './baseFormControlStyles';
 import { FormContext } from './FormContext';
 import { isControlPresented } from './isControlPresented';
 
-type BaseProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'name' | 'value' | 'defaultValue'> & {
+type BaseProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'name' | 'value'> & {
   description?: string;
   mod?: 'surface';
   long?: boolean;
   short?: boolean;
-  defaultValue?: string;
 };
 
 type ControlledProps = BaseProps & {
diff --git a/webapp/packages/core-blocks/src/FormControls/InputFieldNew.tsx b/webapp/packages/core-blocks/src/FormControls/InputFieldNew.tsx
index 9ce1b9372f..ea0207cd8a 100644
--- a/webapp/packages/core-blocks/src/FormControls/InputFieldNew.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/InputFieldNew.tsx
@@ -28,12 +28,11 @@ const INPUT_FIELD_STYLES = css`
   }
 `;
 
-type BaseProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'name' | 'value' | 'defaultValue'> & ILayoutSizeProps & {
+type BaseProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'name' | 'value'> & ILayoutSizeProps & {
   description?: string;
   mod?: 'surface';
   ref?: React.Ref<HTMLInputElement>;
   style?: ComponentStyle;
-  defaultValue?: string | number;
 };
 
 type ControlledProps = BaseProps & {
diff --git a/webapp/packages/core-blocks/src/FormControls/isControlPresented.ts b/webapp/packages/core-blocks/src/FormControls/isControlPresented.ts
index d8fcb8ca8a..16ba499ac9 100644
--- a/webapp/packages/core-blocks/src/FormControls/isControlPresented.ts
+++ b/webapp/packages/core-blocks/src/FormControls/isControlPresented.ts
@@ -7,7 +7,7 @@
  */
 
 export function isControlPresented(
-  name: string | undefined, state: any, defaultValue?: string | number | boolean
+  name: string | undefined, state: any, defaultValue?: string | number | readonly string[]
 ): boolean {
   if (state !== undefined && name !== undefined) {
     if (name in state) {
diff --git a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/ObjectPropertyInfoFormNew.tsx b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/ObjectPropertyInfoFormNew.tsx
index 197d31a5a1..70a4729214 100644
--- a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/ObjectPropertyInfoFormNew.tsx
+++ b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/ObjectPropertyInfoFormNew.tsx
@@ -17,7 +17,7 @@ import { RenderField } from './RenderField';
 
 interface ObjectPropertyFormProps extends ILayoutSizeProps {
   properties: ObjectPropertyInfo[];
-  state?: Record<string, string | number>;
+  state?: Record<string, any>;
   category?: string | null;
   editable?: boolean;
   autofillToken?: string;
diff --git a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx
index 167d8a9fdb..d2ff2688b7 100644
--- a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx
+++ b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx
@@ -111,6 +111,7 @@ export const RenderField: React.FC<RenderFieldProps> = observer(function RenderF
           id={property.id}
           name={property.id!}
           state={state}
+          defaultChecked={defaultValue}
           title={property.description}
           disabled={disabled || readOnly}
           className={className}
@@ -124,6 +125,7 @@ export const RenderField: React.FC<RenderFieldProps> = observer(function RenderF
         id={property.id}
         name={property.id!}
         checked={value}
+        defaultChecked={defaultValue}
         title={property.description}
         disabled={disabled || readOnly}
         className={className}
@@ -175,6 +177,7 @@ export const RenderField: React.FC<RenderFieldProps> = observer(function RenderF
         title={property.description}
         name={property.id!}
         state={state}
+        defaultValue={defaultValue}
         description={description}
         disabled={disabled}
         readOnly={readOnly}
@@ -194,6 +197,7 @@ export const RenderField: React.FC<RenderFieldProps> = observer(function RenderF
       title={property.description}
       name={property.id!}
       value={value}
+      defaultValue={defaultValue}
       description={description}
       disabled={disabled}
       readOnly={readOnly}