diff --git a/src/lib/metrics.ts b/src/lib/metrics.ts
index 64e0caac2b..429f3478f4 100644
--- a/src/lib/metrics.ts
+++ b/src/lib/metrics.ts
@@ -117,10 +117,12 @@ export default class MetricsMonitor {
             help: 'Number of times a feature flag has been used',
             labelNames: ['toggle', 'active', 'appName'],
         });
-        const featureFlagsTotal = createGauge({
+        dbMetrics.registerGaugeDbMetric({
             name: 'feature_toggles_total',
             help: 'Number of feature flags',
             labelNames: ['version'],
+            query: () => instanceStatsService.getToggleCount(),
+            map: (count) => ({ count, labels: { version } }),
         });
         dbMetrics.registerGaugeDbMetric({
             name: 'max_feature_environment_strategies',
@@ -446,9 +448,6 @@ export default class MetricsMonitor {
                         : Promise.resolve([]),
                 ]);
 
-                featureFlagsTotal.reset();
-                featureFlagsTotal.labels({ version }).set(stats.featureToggles);
-
                 featureTogglesArchivedTotal.reset();
                 featureTogglesArchivedTotal.set(stats.archivedFeatureToggles);