diff --git a/.eslintrc.json b/.eslintrc.json
index 26379687..ee1b3b13 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -30,7 +30,8 @@
   },
   "parser": "@typescript-eslint/parser",
   "ignorePatterns": [
-    "components/ui/"
+    "components/ui/",
+    "next.config.js"
   ],
   "overrides": [
     {
diff --git a/next.config.js b/next.config.js
index 4654b83d..23d6cd15 100644
--- a/next.config.js
+++ b/next.config.js
@@ -5,6 +5,8 @@ const nextConfig = {
   images: {
     unoptimized: true
   },
+  // Keep falkordb server-only to avoid bundling BigInt in client/runtime
+  serverExternalPackages: ['falkordb'],
   async headers() {
     return [
       {
diff --git a/package-lock.json b/package-lock.json
index 1e97d9e1..73497ed0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54,7 +54,7 @@
         "eslint-plugin-react": "^7.37.4",
         "eslint-plugin-react-hooks": "^4.6.2",
         "eventsource": "^4.0.0",
-        "falkordb": "^6.3.1",
+        "falkordb": "^6.4.0",
         "jose": "^6.1.0",
         "lodash": "^4.17.21",
         "lucide-react": "^0.475.0",
@@ -1147,6 +1147,18 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@js-temporal/polyfill": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/@js-temporal/polyfill/-/polyfill-0.5.1.tgz",
+      "integrity": "sha512-hloP58zRVCRSpgDxmqCWJNlizAlUgJFqG2ypq79DCvyv9tHjRYMDOcPFjzfl/A1/YxDvRCZz8wvZvmapQnKwFQ==",
+      "license": "ISC",
+      "dependencies": {
+        "jsbi": "^4.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@jsdevtools/ono": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz",
@@ -7521,14 +7533,15 @@
       }
     },
     "node_modules/falkordb": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/falkordb/-/falkordb-6.3.1.tgz",
-      "integrity": "sha512-hnu4vHVZMugPRJHYSQtn7vn2wNQKHrLa5IDiyEnvb8kmUyAzCHuYzDT3RLOJoE0Cfg/hWKTY/EE8UlrAnJiK0g==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/falkordb/-/falkordb-6.4.0.tgz",
+      "integrity": "sha512-hHYwq6oE3UCgWO4vRFuZ9FsE7qwNsiKHAvDyKsN3X2EiMnCdsBvkooliDu5GimSBQZcU/b6uK5CDk4hOCDQrXw==",
       "license": "MIT",
       "workspaces": [
         "./packages/*"
       ],
       "dependencies": {
+        "@js-temporal/polyfill": "^0.5.1",
         "@redis/client": "^1.6.0",
         "cluster-key-slot": "1.1.2",
         "generic-pool": "^3.9.0",
@@ -8952,6 +8965,12 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsbi": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/jsbi/-/jsbi-4.3.2.tgz",
+      "integrity": "sha512-9fqMSQbhJykSeii05nxKl4m6Eqn2P6rOlYiS+C5Dr/HPIU/7yZxu5qzbs40tgaFORiw2Amd0mirjxatXYMkIew==",
+      "license": "Apache-2.0"
+    },
     "node_modules/jsesc": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
diff --git a/package.json b/package.json
index fb4dfa9b..520f13c8 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "eslint-plugin-react": "^7.37.4",
     "eslint-plugin-react-hooks": "^4.6.2",
     "eventsource": "^4.0.0",
-    "falkordb": "^6.3.1",
+    "falkordb": "^6.4.0",
     "jose": "^6.1.0",
     "lodash": "^4.17.21",
     "lucide-react": "^0.475.0",