diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
index 98e9f966f3..096670c9a7 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
@@ -331,7 +331,7 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene
                             if (subscriptionUpdate == null) {
                                 subscriptionUpdate = new ArrayList<>();
                             }
-                            subscriptionUpdate.add(new BasicTsKvEntry(0, new StringDataEntry(key, null)));
+                            subscriptionUpdate.add(new BasicTsKvEntry(0, new StringDataEntry(key, "")));
                         }
                     }
                     return subscriptionUpdate;
@@ -355,7 +355,7 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene
                             if (subscriptionUpdate == null) {
                                 subscriptionUpdate = new ArrayList<>();
                             }
-                            subscriptionUpdate.add(new BasicTsKvEntry(0, new StringDataEntry(key, null)));
+                            subscriptionUpdate.add(new BasicTsKvEntry(0, new StringDataEntry(key, "")));
                         }
                     }
                     return subscriptionUpdate;
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 9b5cbd1598..43acf5e61b 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 !== null);
+        const filteredData = data.filter(attrData => attrData.lastUpdateTs !== 0 && attrData.value !== '');
         return pageLink.filterData(filteredData);
       })
     );