diff --git a/src/lib/db/client-metrics-store-v2.ts b/src/lib/db/client-metrics-store-v2.ts
index 0737a6216a..74a94de922 100644
--- a/src/lib/db/client-metrics-store-v2.ts
+++ b/src/lib/db/client-metrics-store-v2.ts
@@ -24,8 +24,8 @@ const fromRow = (row: ClientMetricsEnvTable) => ({
     appName: row.app_name,
     environment: row.environment,
     timestamp: row.timestamp,
-    yes: row.yes,
-    no: row.no,
+    yes: Number(row.yes),
+    no: Number(row.no),
 });
 
 const toRow = (metric: IClientMetricsEnv) => ({
diff --git a/src/migrations/20220129113106-metrics-counters-as-bigint.js b/src/migrations/20220129113106-metrics-counters-as-bigint.js
new file mode 100644
index 0000000000..f967a79ed3
--- /dev/null
+++ b/src/migrations/20220129113106-metrics-counters-as-bigint.js
@@ -0,0 +1,23 @@
+'use strict';
+
+exports.up = function (db, cb) {
+    db.runSql(
+        `
+        ALTER TABLE client_metrics_env
+        ALTER COLUMN yes TYPE BIGINT,
+        ALTER COLUMN no TYPE BIGINT;
+        `,
+        cb,
+    );
+};
+
+exports.down = function (db, cb) {
+    db.runSql(
+        `
+        ALTER TABLE client_metrics_env
+        ALTER COLUMN yes TYPE INTEGER,
+        ALTER COLUMN no TYPE INTEGER;
+        `,
+        cb,
+    );
+};