diff --git a/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapCompositeQueryFromQuery.ts b/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapCompositeQueryFromQuery.ts
index 569f714543..6304e26347 100644
--- a/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapCompositeQueryFromQuery.ts
+++ b/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapCompositeQueryFromQuery.ts
@@ -92,7 +92,7 @@ export const mapCompositeQueryFromQuery = (
 ): ICompositeMetricQuery => {
 	const functionToBuildQuery = queryTypeMethodMapping[query.queryType];
 
-	if (functionToBuildQuery) {
+	if (functionToBuildQuery && typeof functionToBuildQuery === 'function') {
 		return functionToBuildQuery(query, panelType);
 	}