diff --git a/server/src/tenant/entity-resolver/utils/convert-fields-to-graphql.util.ts b/server/src/tenant/entity-resolver/utils/convert-fields-to-graphql.util.ts
index 71a98f9ad..91a35e89e 100644
--- a/server/src/tenant/entity-resolver/utils/convert-fields-to-graphql.util.ts
+++ b/server/src/tenant/entity-resolver/utils/convert-fields-to-graphql.util.ts
@@ -15,7 +15,12 @@ export const convertFieldsToGraphQL = (
     let fieldAlias = key;
 
     if (fieldsMap.has(key)) {
-      const metadata = fieldsMap.get(key)!;
+      const metadata = fieldsMap.get(key);
+
+      if (!metadata) {
+        throw new Error(`Field ${key} not found in fieldsMap`);
+      }
+
       const entries = Object.entries(metadata.targetColumnMap);
 
       if (entries.length > 0) {