diff --git a/controlplane/src/core/repositories/analytics/UsageRepository.ts b/controlplane/src/core/repositories/analytics/UsageRepository.ts
index 6ed323f88c..f9747713f4 100644
--- a/controlplane/src/core/repositories/analytics/UsageRepository.ts
+++ b/controlplane/src/core/repositories/analytics/UsageRepository.ts
@@ -212,6 +212,10 @@ export class UsageRepository {
     rangeInHours: number;
     fields: Field[];
   }): Promise<{ name: string; typeName: string }[]> {
+    if (fields.length === 0) {
+      return [];
+    }
+
     // Escape single quotes in field names and type names
     const arrayJoinFields = fields
       .map((field) => {
@@ -301,6 +305,10 @@ export class UsageRepository {
     range: number;
     fields: Field[];
   }): Promise<{ name: string; typeName: string }[]> {
+    if (fields.length === 0) {
+      return [];
+    }
+
     // Escape single quotes in field names and type names
     const arrayJoinFields = fields
       .map((field) => {