diff --git a/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx b/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx
index fbe5676ff52d..c5fa0ef06d76 100644
--- a/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx
+++ b/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx
@@ -163,12 +163,11 @@ export const GroupByFilter = memo(function GroupByFilter({
 	}, []);
 
 	useEffect(() => {
-		const currentValues: SelectOption<string, string>[] = query.groupBy.map(
-			(item) => ({
+		const currentValues: SelectOption<string, string>[] =
+			query.groupBy?.map((item) => ({
 				label: `${item.key}`,
 				value: `${item.id}`,
-			}),
-		);
+			})) || [];
 
 		setLocalValues(currentValues);
 	}, [query]);
@@ -191,7 +190,7 @@ export const GroupByFilter = memo(function GroupByFilter({
 			notFoundContent={isFetching ? <Spin size="small" /> : null}
 			onChange={handleChange}
 			data-testid="group-by"
-			placeholder={localValues.length === 0 ? 'Everything (no breakdown)' : ''}
+			placeholder={localValues?.length === 0 ? 'Everything (no breakdown)' : ''}
 		/>
 	);
 });
diff --git a/frontend/src/utils/convertNewToOldQueryBuilder.ts b/frontend/src/utils/convertNewToOldQueryBuilder.ts
index f0d0fe16834e..0500557545c8 100644
--- a/frontend/src/utils/convertNewToOldQueryBuilder.ts
+++ b/frontend/src/utils/convertNewToOldQueryBuilder.ts
@@ -34,16 +34,18 @@ export const convertBuilderQueryToIBuilderQuery = (
 		queryName: builderQuery.name,
 		dataSource,
 		legend: builderQuery.legend,
-		groupBy: builderQuery.groupBy?.map((group) => ({
-			key: group?.name,
-			dataType: group?.fieldDataType,
-			type: group?.fieldContext,
-			id: `${group?.name}--${group?.fieldDataType}--${group?.fieldContext}`,
-		})),
-		orderBy: builderQuery.order?.map((order) => ({
-			columnName: order?.key?.name,
-			order: order?.direction,
-		})),
+		groupBy:
+			builderQuery.groupBy?.map((group) => ({
+				key: group?.name,
+				dataType: group?.fieldDataType,
+				type: group?.fieldContext,
+				id: `${group?.name}--${group?.fieldDataType}--${group?.fieldContext}`,
+			})) || [],
+		orderBy:
+			builderQuery.order?.map((order) => ({
+				columnName: order?.key?.name,
+				order: order?.direction,
+			})) || [],
 	} as unknown) as IBuilderQuery;
 
 	return result;