diff --git a/packages/app/src/vis-packs/core/matrix/utils.ts b/packages/app/src/vis-packs/core/matrix/utils.ts
index 2b0c54b97..21a3e4029 100644
--- a/packages/app/src/vis-packs/core/matrix/utils.ts
+++ b/packages/app/src/vis-packs/core/matrix/utils.ts
@@ -38,13 +38,16 @@ export function createNumericFormatter(
 export function createBigIntFormatter(
   notation: Notation,
 ): (val: ScalarValue<NumericType>) => string {
+  const formatter = createNumericFormatter(notation);
+
   switch (notation) {
-    case Notation.Scientific: {
-      const formatter = createNumericFormatter(notation);
+    case Notation.Scientific:
       return (val) => formatter(Number(val));
-    }
+
     default:
-      return (val) => val.toString();
+      return (val) => {
+        return typeof val === 'bigint' ? val.toString() : formatter(val);
+      };
   }
 }