diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte
index a25e6f4c1..7be1202e2 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte
@@ -12,6 +12,7 @@
 <InputSelect
     {id}
     {label}
+    bind:value
     {optionalText}
     placeholder="Select a value"
     required={attribute.required}
@@ -19,5 +20,4 @@
         !attribute.required && { label: 'NULL', value: null },
         { label: 'True', value: true },
         { label: 'False', value: false }
-    ].filter(Boolean)}
-    bind:value />
+    ].filter(Boolean)} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte
index cf93d4b5f..5d7b9989f 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte
@@ -6,14 +6,12 @@
     export let label: string;
     export let value: string | null;
     export let attribute: Models.AttributeUrl;
-
-    $: nullable = attribute.required ? false : !value;
 </script>
 
 <InputEmail
     {id}
     {label}
-    {nullable}
+    bind:value
     placeholder="Enter URL"
     required={attribute.required}
-    bind:value />
+    nullable={!attribute.required} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
index 00ee6a2af..a0725df98 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
@@ -6,16 +6,14 @@
     export let label: string;
     export let value: number;
     export let attribute: Models.AttributeInteger;
-
-    $: nullable = attribute.required ? false : !value;
 </script>
 
 <InputNumber
     {id}
     {label}
-    {nullable}
-    required={attribute.required}
+    bind:value
     min={attribute.min}
     max={attribute.max}
-    step={attribute.type === 'double' ? 'any' : 1}
-    bind:value />
+    required={attribute.required}
+    nullable={!attribute.required}
+    step={attribute.type === 'double' ? 'any' : 1} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
index 94b18799e..901555a9b 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
@@ -6,26 +6,24 @@
     export let label: string;
     export let value: string;
     export let attribute: Models.AttributeString;
-
-    $: nullable = attribute.required ? false : !value;
 </script>
 
 {#if attribute.size >= 50}
     <InputTextarea
         {id}
         {label}
-        {nullable}
+        bind:value
         placeholder="Enter string"
-        required={attribute.required}
         maxlength={attribute.size}
-        bind:value />
+        required={attribute.required}
+        nullable={!attribute.required} />
 {:else}
     <InputText
         {id}
         {label}
-        {nullable}
+        bind:value
         placeholder="Enter string"
-        required={attribute.required}
         maxlength={attribute.size}
-        bind:value />
+        required={attribute.required}
+        nullable={!attribute.required} />
 {/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
index d8c74bca7..9a035a067 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
@@ -6,14 +6,12 @@
     export let label: string;
     export let value: string | null;
     export let attribute: Models.AttributeUrl;
-
-    $: nullable = attribute.required ? false : !value;
 </script>
 
 <InputURL
     {id}
     {label}
-    {nullable}
+    bind:value
     placeholder="Enter URL"
     required={attribute.required}
-    bind:value />
+    nullable={!attribute.required} />