diff --git a/src/app/interactions/query-builder/query-builder-request-sample/query-builder-request-sample.component.ts b/src/app/interactions/query-builder/query-builder-request-sample/query-builder-request-sample.component.ts
index e2eb42363f..51f3b12298 100644
--- a/src/app/interactions/query-builder/query-builder-request-sample/query-builder-request-sample.component.ts
+++ b/src/app/interactions/query-builder/query-builder-request-sample/query-builder-request-sample.component.ts
@@ -74,6 +74,12 @@ export class QueryBuilderRequestSampleComponent implements OnInit, AfterViewInit
     }
 
     private calculateColsInView() {
-        this.grid.columns.forEach(column => column.hidden = !this.expressionTree.returnFields.includes(column.field));
+        if (this.expressionTree.returnFields.length === 0 || this.expressionTree.returnFields[0] === '*') {
+            const selectedEntity = this.entities.find(entity => entity.name === this.expressionTree.entity);
+            const selectedEntityFields = selectedEntity.fields.map(field => field.field);
+            this.grid.columns.forEach(column => column.hidden = !selectedEntityFields.includes(column.field));
+        } else {
+            this.grid.columns.forEach(column => column.hidden = !this.expressionTree.returnFields.includes(column.field));
+        }
     }
 }
\ No newline at end of file
diff --git a/src/app/interactions/query-builder/query-builder-sql-sample/query-builder-sql-sample.component.ts b/src/app/interactions/query-builder/query-builder-sql-sample/query-builder-sql-sample.component.ts
index e85b571f17..1ea250a63a 100644
--- a/src/app/interactions/query-builder/query-builder-sql-sample/query-builder-sql-sample.component.ts
+++ b/src/app/interactions/query-builder/query-builder-sql-sample/query-builder-sql-sample.component.ts
@@ -199,6 +199,12 @@ export class QueryBuilderSqlSampleComponent implements OnInit, AfterViewInit {
     }
 
     private calculateColsInView() {
-        this.grid.columns.forEach(column => column.hidden = !this.expressionTree.returnFields.includes(column.field));
+        if (this.expressionTree.returnFields.length === 0 || this.expressionTree.returnFields[0] === '*') {
+            const selectedEntity = this.entities.find(entity => entity.name === this.expressionTree.entity);
+            const selectedEntityFields = selectedEntity.fields.map(field => field.field);
+            this.grid.columns.forEach(column => column.hidden = !selectedEntityFields.includes(column.field));
+        } else {
+            this.grid.columns.forEach(column => column.hidden = !this.expressionTree.returnFields.includes(column.field));
+        }
     }
 }
\ No newline at end of file