diff --git a/src/lib/db/feature-tag-store.ts b/src/lib/db/feature-tag-store.ts
index 730e53b88e..bee15a2393 100644
--- a/src/lib/db/feature-tag-store.ts
+++ b/src/lib/db/feature-tag-store.ts
@@ -34,7 +34,7 @@ class FeatureTagStore implements IFeatureTagStore {
         this.logger = getLogger('feature-tag-store.ts');
         this.timer = (action) =>
             metricsHelper.wrapTimer(eventBus, DB_TIME, {
-                store: 'feature-toggle',
+                store: 'feature-tag-toggle',
                 action,
             });
     }
diff --git a/src/lib/features/client-feature-toggles/client-feature-toggle-store.ts b/src/lib/features/client-feature-toggles/client-feature-toggle-store.ts
index 238cf3cb36..e35e47f11c 100644
--- a/src/lib/features/client-feature-toggles/client-feature-toggle-store.ts
+++ b/src/lib/features/client-feature-toggles/client-feature-toggle-store.ts
@@ -51,7 +51,7 @@ export default class FeatureToggleClientStore
         this.logger = getLogger('feature-toggle-client-store.ts');
         this.timer = (action) =>
             metricsHelper.wrapTimer(eventBus, DB_TIME, {
-                store: 'feature-toggle',
+                store: 'client-feature-toggle',
                 action,
             });
         this.flagResolver = flagResolver;
@@ -66,7 +66,7 @@ export default class FeatureToggleClientStore
         const isAdmin = requestType === 'admin';
         const isPlayground = requestType === 'playground';
         const environment = featureQuery?.environment || DEFAULT_ENV;
-        const stopTimer = this.timer('getFeatureAdmin');
+        const stopTimer = this.timer(`getFeatureAdmin${requestType}`);
 
         let selectColumns = [
             'features.name as name',