diff --git a/src/lib/features/feature-toggle/feature-toggle-service.ts b/src/lib/features/feature-toggle/feature-toggle-service.ts
index ad7fb75daa..3db086704b 100644
--- a/src/lib/features/feature-toggle/feature-toggle-service.ts
+++ b/src/lib/features/feature-toggle/feature-toggle-service.ts
@@ -1951,6 +1951,11 @@ class FeatureToggleService {
         const eligibleFeatureNames = eligibleFeatures.map(
             (toggle) => toggle.name,
         );
+
+        if (eligibleFeatures.length === 0) {
+            return;
+        }
+
         const tags = await this.tagStore.getAllByFeatures(eligibleFeatureNames);
         await this.featureToggleStore.batchDelete(eligibleFeatureNames);