diff --git a/packages/console/src/components/Switch/index.tsx b/packages/console/src/components/Switch/index.tsx
index 7242c88ec..32273643b 100644
--- a/packages/console/src/components/Switch/index.tsx
+++ b/packages/console/src/components/Switch/index.tsx
@@ -12,7 +12,7 @@ const Switch = ({ label, ...rest }: Props, ref?: Ref<HTMLInputElement>) => {
     <div className={styles.wrapper}>
       <div className={styles.label}>{label}</div>
       <label className={styles.switch}>
-        <input type="checkbox" defaultChecked={false} {...rest} ref={ref} />
+        <input type="checkbox" {...rest} ref={ref} />
         <span className={styles.slider} />
       </label>
     </div>
diff --git a/packages/console/src/pages/Connectors/components/ConfigForm/index.tsx b/packages/console/src/pages/Connectors/components/ConfigForm/index.tsx
index 9b7e3c6dd..c1c5fad3b 100644
--- a/packages/console/src/pages/Connectors/components/ConfigForm/index.tsx
+++ b/packages/console/src/pages/Connectors/components/ConfigForm/index.tsx
@@ -49,22 +49,22 @@ const ConfigForm = ({ formItems }: Props) => {
     const hasError = Boolean(errors[item.key]);
     const errorMessage = errors[item.key]?.message;
 
-    const commonProperties = {
+    const buildCommonProperties = () => ({
       ...register(item.key, { required: item.required }),
       placeholder: item.placeholder,
       hasError,
-    };
+    });
 
     if (item.type === ConnectorConfigFormItemType.Text) {
-      return <TextInput {...commonProperties} />;
+      return <TextInput {...buildCommonProperties()} />;
     }
 
     if (item.type === ConnectorConfigFormItemType.MultilineText) {
-      return <Textarea rows={5} {...commonProperties} />;
+      return <Textarea rows={5} {...buildCommonProperties()} />;
     }
 
     if (item.type === ConnectorConfigFormItemType.Number) {
-      return <TextInput type="number" {...commonProperties} />;
+      return <TextInput type="number" {...buildCommonProperties()} />;
     }
 
     return (