diff --git a/src/lib/elements/forms/inputEmail.svelte b/src/lib/elements/forms/inputEmail.svelte
index 0ce322cba1..e032d795a9 100644
--- a/src/lib/elements/forms/inputEmail.svelte
+++ b/src/lib/elements/forms/inputEmail.svelte
@@ -9,6 +9,7 @@
     export let value = '';
     export let placeholder = '';
     export let required = false;
+    export let nullable = false;
     export let disabled = false;
     export let readonly = false;
     export let autofocus = false;
@@ -70,7 +71,7 @@
             bind:value
             bind:this={element}
             on:invalid={handleInvalid} />
-        {#if !required}
+        {#if nullable && !required}
             <ul
                 class="buttons-list u-cross-center u-gap-8 u-position-absolute u-inset-block-start-8 u-inset-block-end-8 u-inset-inline-end-12">
                 <li class="buttons-list-item">
diff --git a/src/lib/elements/forms/inputNumber.svelte b/src/lib/elements/forms/inputNumber.svelte
index dd6a7b4347..7c36615e0b 100644
--- a/src/lib/elements/forms/inputNumber.svelte
+++ b/src/lib/elements/forms/inputNumber.svelte
@@ -10,6 +10,7 @@
     export let value: number = null;
     export let placeholder = '';
     export let required = false;
+    export let nullable = false;
     export let disabled = false;
     export let readonly = false;
     export let autofocus = false;
@@ -86,7 +87,7 @@
             style:--amount-of-buttons={required ? 0 : 1.75} />
         <ul
             class="buttons-list u-cross-center u-gap-8 u-position-absolute u-inset-block-start-8 u-inset-block-end-8 u-inset-inline-end-12">
-            {#if !required}
+            {#if nullable && !required}
                 <li class="buttons-list-item">
                     <NullCheckbox checked={value === null} on:change={handleNullChange} />
                 </li>
diff --git a/src/lib/elements/forms/inputText.svelte b/src/lib/elements/forms/inputText.svelte
index 575d133ef2..a7082a4b0a 100644
--- a/src/lib/elements/forms/inputText.svelte
+++ b/src/lib/elements/forms/inputText.svelte
@@ -11,6 +11,7 @@
     export let value = '';
     export let placeholder = '';
     export let required = false;
+    export let nullable = false;
     export let disabled = false;
     export let readonly = false;
     export let autofocus = false;
@@ -81,7 +82,7 @@
                     <TextCounter max={maxlength} count={value?.length ?? 0} />
                 </li>
             {/if}
-            {#if !required}
+            {#if nullable && !required}
                 <li class="buttons-list-item">
                     <NullCheckbox checked={value === null} on:change={handleNullChange} />
                 </li>
diff --git a/src/lib/elements/forms/inputTextarea.svelte b/src/lib/elements/forms/inputTextarea.svelte
index 28d39f3c50..7a9c121a68 100644
--- a/src/lib/elements/forms/inputTextarea.svelte
+++ b/src/lib/elements/forms/inputTextarea.svelte
@@ -10,6 +10,7 @@
     export let value = '';
     export let placeholder = '';
     export let required = false;
+    export let nullable = false;
     export let disabled = false;
     export let readonly = false;
     export let autofocus = false;
@@ -79,7 +80,7 @@
                     <TextCounter max={maxlength} count={value?.length ?? 0} />
                 </li>
             {/if}
-            {#if !required}
+            {#if nullable && !required}
                 <li class="buttons-list-item">
                     <NullCheckbox checked={value === null} on:change={handleNullChange} />
                 </li>
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
index abbe0787b1..d490f0e3d3 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
@@ -13,6 +13,7 @@
     {id}
     {label}
     {optionalText}
+    nullable
     required={attribute.required}
     min={attribute.min}
     max={attribute.max}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
index 269eeb6d96..ecb1c613e4 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
@@ -14,6 +14,7 @@
     <InputTextarea
         {id}
         {label}
+        nullable
         placeholder="Enter string"
         showLabel={!!label?.length}
         required={attribute.required}
@@ -25,6 +26,7 @@
         {id}
         {label}
         {optionalText}
+        nullable
         placeholder="Enter string"
         showLabel={!!label?.length}
         required={attribute.required}