diff --git a/src/lib/helpers/faker.ts b/src/lib/helpers/faker.ts
index b09ac5dab..421288bb3 100644
--- a/src/lib/helpers/faker.ts
+++ b/src/lib/helpers/faker.ts
@@ -199,14 +199,20 @@ function generateSingleValue(
         case 'integer': {
             const intAttr = column as Models.ColumnInteger;
             const min = isWithinSafeRange(intAttr.min) ? intAttr.min : 0;
-            const max = isWithinSafeRange(intAttr.max) ? intAttr.max : Math.max(min + 100, 100);
+            const fallbackMax = Math.max(min + 100, 100);
+            const max = isWithinSafeRange(intAttr.max)
+                ? intAttr.max
+                : Math.min(fallbackMax, Number.MAX_SAFE_INTEGER);
             return faker.number.int({ min, max });
         }
 
         case 'double': {
             const floatAttr = column as Models.ColumnFloat;
             const min = isWithinSafeRange(floatAttr.min) ? floatAttr.min : 0;
-            const max = isWithinSafeRange(floatAttr.max) ? floatAttr.max : Math.max(min + 100, 100);
+            const fallbackMax = Math.max(min + 100, 100);
+            const max = isWithinSafeRange(floatAttr.max)
+                ? floatAttr.max
+                : Math.min(fallbackMax, Number.MAX_SAFE_INTEGER);
             const precision = 4;
 
             return faker.number.float({ min, max, fractionDigits: precision });
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte
index f6dce2ce0..9a77979dc 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte
@@ -52,7 +52,7 @@
     let showDelete = $state(false);
     let showOverview = $state(false);
 
-    let columns = $state([
+    let columns = $derived([
         { id: 'key', width: { min: $isSmallViewport ? 250 : 200 }, resizable: false },
         { id: 'type', width: 120, resizable: false },
         { id: 'columns', width: { min: 200 }, resizable: false },