diff --git a/ui-ngx/src/app/shared/models/query/query.models.ts b/ui-ngx/src/app/shared/models/query/query.models.ts
index fd7fa68b5e..dbe114e18e 100644
--- a/ui-ngx/src/app/shared/models/query/query.models.ts
+++ b/ui-ngx/src/app/shared/models/query/query.models.ts
@@ -819,12 +819,14 @@ export function updateDatasourceFromEntityInfo(datasource: Datasource, entity: E
   datasource.entityId = entity.id;
   datasource.entityType = entity.entityType;
   if (datasource.type === DatasourceType.entity || datasource.type === DatasourceType.entityCount) {
-    datasource.entityName = entity.name;
-    datasource.entityLabel = entity.label;
-    datasource.name = entity.name;
-    datasource.entityDescription = entity.entityDescription;
-    datasource.entity.label = entity.label;
-    datasource.entity.name = entity.name;
+    if (datasource.type === DatasourceType.entity) {
+      datasource.entityName = entity.name;
+      datasource.entityLabel = entity.label;
+      datasource.name = entity.name;
+      datasource.entityDescription = entity.entityDescription;
+      datasource.entity.label = entity.label;
+      datasource.entity.name = entity.name;
+    }
     if (createFilter) {
       datasource.entityFilter = {
         type: AliasFilterType.singleEntity,