diff --git a/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapCompositeQueryFromQuery.ts b/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapCompositeQueryFromQuery.ts
index 6304e26347..52019b13b6 100644
--- a/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapCompositeQueryFromQuery.ts
+++ b/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapCompositeQueryFromQuery.ts
@@ -90,10 +90,12 @@ export const mapCompositeQueryFromQuery = (
 	query: Query,
 	panelType: PANEL_TYPES | null,
 ): ICompositeMetricQuery => {
-	const functionToBuildQuery = queryTypeMethodMapping[query.queryType];
+	if (query.queryType in queryTypeMethodMapping) {
+		const functionToBuildQuery = queryTypeMethodMapping[query.queryType];
 
-	if (functionToBuildQuery && typeof functionToBuildQuery === 'function') {
-		return functionToBuildQuery(query, panelType);
+		if (functionToBuildQuery && typeof functionToBuildQuery === 'function') {
+			return functionToBuildQuery(query, panelType);
+		}
 	}
 
 	return {