diff --git a/lattice/src/App/QueryBuilder/QueryBuilder.tsx b/lattice/src/App/QueryBuilder/QueryBuilder.tsx
index b8a048556..fcad11f97 100644
--- a/lattice/src/App/QueryBuilder/QueryBuilder.tsx
+++ b/lattice/src/App/QueryBuilder/QueryBuilder.tsx
@@ -104,10 +104,13 @@ export const QueryBuilder: FC<QueryBuilderProps> = ({
   useEffect(() => {
     setGroupByFilters(
       queriesList.filter(
-        (q) => q.table === selectedTable.name && q.operation === 'Extract'
+        (q) =>
+          q.table === selectedTable.name &&
+          q.operation === 'Extract' &&
+          q.rowCalls.length > 0
       )
     );
-  }, [selectedTable]);
+  }, [selectedTable, queriesList]);
 
   const getColumnsToShow = (cols?: { name: string; show: boolean }[]) => {
     let columns: string[] = [];