diff --git a/src/lib/services/client-metrics/index.ts b/src/lib/services/client-metrics/index.ts
index 493eaaf4fa..7fa99422e7 100644
--- a/src/lib/services/client-metrics/index.ts
+++ b/src/lib/services/client-metrics/index.ts
@@ -140,8 +140,12 @@ export default class ClientMetricsService {
     ): Promise<void> {
         const value = await clientMetricsSchema.validateAsync(data);
         const toggleNames = Object.keys(value.bucket.toggles);
-        await this.featureToggleStore.setLastSeen(toggleNames);
-        await this.clientMetricsStore.insert(value);
+
+        if (toggleNames.length > 0) {
+            await this.featureToggleStore.setLastSeen(toggleNames);
+            await this.clientMetricsStore.insert(value);
+        }
+
         await this.clientInstanceStore.insert({
             appName: value.appName,
             instanceId: value.instanceId,