diff --git a/package.json b/package.json
index 142087fef0..3104f604a4 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1",
         "@appwrite.io/pink-legacy": "^1.0.3",
-        "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0f90bf1",
+        "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@18188b7",
         "@faker-js/faker": "^9.9.0",
         "@popperjs/core": "^2.11.8",
         "@sentry/sveltekit": "^8.38.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index abb1d93723..28f2888f7f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -24,8 +24,8 @@ importers:
         specifier: ^1.0.3
         version: 1.0.3
       '@appwrite.io/pink-svelte':
-        specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0f90bf1
-        version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0f90bf1(svelte@5.25.3)
+        specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@18188b7
+        version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@18188b7(svelte@5.25.3)
       '@faker-js/faker':
         specifier: ^9.9.0
         version: 9.9.0
@@ -284,8 +284,8 @@ packages:
   '@appwrite.io/pink-legacy@1.0.3':
     resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==}
 
-  '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0f90bf1':
-    resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0f90bf1}
+  '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@18188b7':
+    resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@18188b7}
     version: 2.0.0-RC.2
     peerDependencies:
       svelte: ^4.0.0
@@ -3719,7 +3719,7 @@ snapshots:
       '@appwrite.io/pink-icons': 1.0.0
       the-new-css-reset: 1.11.3
 
-  '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0f90bf1(svelte@5.25.3)':
+  '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@18188b7(svelte@5.25.3)':
     dependencies:
       '@appwrite.io/pink-icons-svelte': 2.0.0-RC.1(svelte@5.25.3)
       '@floating-ui/dom': 1.6.13
diff --git a/src/lib/elements/forms/inputNumber.svelte b/src/lib/elements/forms/inputNumber.svelte
index 2abf5228a2..f18aff0fa0 100644
--- a/src/lib/elements/forms/inputNumber.svelte
+++ b/src/lib/elements/forms/inputNumber.svelte
@@ -18,8 +18,9 @@
 
     let error: string;
 
-    function coerceToNumber(event: Event & { currentTarget: EventTarget & HTMLInputElement }) {
-        const raw = event.currentTarget?.value ?? '';
+    function coerceToNumber(event: CustomEvent) {
+        const raw = event.detail ?? '';
+
         if (raw === '') {
             value = nullable ? null : (undefined as unknown as number);
             return;
@@ -74,7 +75,6 @@
     helper={error || helper}
     state={error ? 'error' : 'default'}
     on:invalid={handleInvalid}
-    on:input={coerceToNumber}
     on:change={coerceToNumber}>
     <svelte:fragment slot="info">
         <slot name="info" slot="info" />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/integer.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/integer.svelte
index 2d80ba6cfa..e8da1e99e4 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/integer.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/integer.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     import { InputNumber } from '$lib/elements/forms';
     import type { Models } from '@appwrite.io/console';
+    import { isWithinSafeRange } from '$lib/helpers/numbers';
 
     export let id: string;
     export let label: string;
@@ -13,6 +14,11 @@
     $: if (limited) {
         label = undefined;
     }
+
+    $: if (limited) {
+        column.min = isWithinSafeRange(column.min) ? column.min : Number.MIN_SAFE_INTEGER;
+        column.max = isWithinSafeRange(column.max) ? column.max : Number.MAX_SAFE_INTEGER;
+    }
 </script>
 
 <InputNumber