diff --git a/packages/web/src/components/CodeEditor/index.jsx b/packages/web/src/components/CodeEditor/index.jsx
index 5b4fc985..643a85c5 100644
--- a/packages/web/src/components/CodeEditor/index.jsx
+++ b/packages/web/src/components/CodeEditor/index.jsx
@@ -14,7 +14,7 @@ function CodeEditor(props) {
     required,
     name,
     label,
-    defaultValue,
+    defaultValue = '',
     shouldUnregister = false,
     disabled,
     'data-test': dataTest,
@@ -39,7 +39,7 @@ function CodeEditor(props) {
     <Controller
       rules={{ required }}
       name={name}
-      defaultValue={defaultValue || ''}
+      defaultValue={defaultValue}
       control={control}
       shouldUnregister={shouldUnregister}
       render={({ field }) => (
diff --git a/packages/web/src/components/ControlledAutocomplete/index.jsx b/packages/web/src/components/ControlledAutocomplete/index.jsx
index ebb33beb..d441a5de 100644
--- a/packages/web/src/components/ControlledAutocomplete/index.jsx
+++ b/packages/web/src/components/ControlledAutocomplete/index.jsx
@@ -53,7 +53,7 @@ function ControlledAutocomplete(props) {
     <Controller
       rules={{ required }}
       name={name}
-      defaultValue={defaultValue || ''}
+      defaultValue={defaultValue}
       control={control}
       shouldUnregister={shouldUnregister}
       render={({
diff --git a/packages/web/src/components/InputCreator/index.jsx b/packages/web/src/components/InputCreator/index.jsx
index aa04b09f..7aea1de6 100644
--- a/packages/web/src/components/InputCreator/index.jsx
+++ b/packages/web/src/components/InputCreator/index.jsx
@@ -162,6 +162,7 @@ function InputCreator(props) {
             required={required}
             disabled={disabled}
             shouldUnregister={shouldUnregister}
+            defaultValue={value}
           />
 
           {isDynamicFieldsLoading && !additionalFields?.length && (
diff --git a/packages/web/src/components/TextField/index.jsx b/packages/web/src/components/TextField/index.jsx
index dfe505c2..38b45d7a 100644
--- a/packages/web/src/components/TextField/index.jsx
+++ b/packages/web/src/components/TextField/index.jsx
@@ -23,7 +23,7 @@ function TextField(props) {
   const {
     required,
     name,
-    defaultValue,
+    defaultValue = '',
     shouldUnregister = false,
     clickToCopy = false,
     readOnly = false,
@@ -38,7 +38,7 @@ function TextField(props) {
     <Controller
       rules={{ required }}
       name={name}
-      defaultValue={defaultValue || ''}
+      defaultValue={defaultValue}
       control={control}
       shouldUnregister={shouldUnregister}
       render={({