diff --git a/frontend/src/hooks/queryBuilder/useQueryBuilderOperations.ts b/frontend/src/hooks/queryBuilder/useQueryBuilderOperations.ts
index 252db8c0fc..9247c552a6 100644
--- a/frontend/src/hooks/queryBuilder/useQueryBuilderOperations.ts
+++ b/frontend/src/hooks/queryBuilder/useQueryBuilderOperations.ts
@@ -205,6 +205,9 @@ export const useQueryOperations: UseQueryOperations = ({
 
 				newQuery.spaceAggregation = '';
 
+				// Handled query with unknown metric to avoid 400 and 500 errors
+				// With metric value typed and not available then - time - 'avg', space - 'avg'
+				// If not typed - time - 'rate', space - 'sum', op - 'count'
 				if (isEmpty(newQuery.aggregateAttribute.type)) {
 					if (!isEmpty(newQuery.aggregateAttribute.key)) {
 						newQuery.aggregateOperator = MetricAggregateOperator.AVG;