diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
index 530b16af47..cc4930483e 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
@@ -186,6 +186,7 @@
               <div fxFlex fxLayout="row" style="overflow: hidden; align-items: center;">
                 <span class="ellipsis">{{attribute.value | tbJson}}</span>
                 <tb-copy-button
+                  *ngIf="attribute.value !== ''"
                   class="attribute-copy"
                   [disabled]="isLoading$ | async"
                   [copyText]="attribute.value | tbJson"
diff --git a/ui-ngx/src/app/modules/home/models/datasource/attribute-datasource.ts b/ui-ngx/src/app/modules/home/models/datasource/attribute-datasource.ts
index 1dce0bb7fb..00853d868e 100644
--- a/ui-ngx/src/app/modules/home/models/datasource/attribute-datasource.ts
+++ b/ui-ngx/src/app/modules/home/models/datasource/attribute-datasource.ts
@@ -89,7 +89,7 @@ export class AttributeDatasource implements DataSource<AttributeData> {
                   pageLink: PageLink): Observable<PageData<AttributeData>> {
     return this.getAllAttributes(entityId, attributesScope).pipe(
       map((data) => {
-        const filteredData = data.filter(attrData => attrData.lastUpdateTs !== 0 && attrData.value !== '');
+        const filteredData = data.filter(attrData => attrData.lastUpdateTs !== 0);
         return pageLink.filterData(filteredData);
       })
     );