diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/BaseResourceProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/BaseResourceProcessor.java
index 4608e52cbf..a9a3bcf9fb 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/BaseResourceProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/BaseResourceProcessor.java
@@ -17,18 +17,24 @@ package org.thingsboard.server.service.edge.rpc.processor.resource;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.TbResource;
+import org.thingsboard.server.common.data.TbResourceInfo;
 import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageDataIterable;
+import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.gen.edge.v1.ResourceUpdateMsg;
 import org.thingsboard.server.service.edge.rpc.processor.BaseEdgeProcessor;
 
 @Slf4j
 public abstract class BaseResourceProcessor extends BaseEdgeProcessor {
 
+    @Autowired
+    private DataValidator<TbResource> resourceValidator;
+
     protected boolean saveOrUpdateTbResource(TenantId tenantId, TbResourceId tbResourceId, ResourceUpdateMsg resourceUpdateMsg) {
         boolean resourceKeyUpdated = false;
         try {
@@ -47,6 +53,9 @@ public abstract class BaseResourceProcessor extends BaseEdgeProcessor {
             }
             String resourceKey = resource.getResourceKey();
             ResourceType resourceType = resource.getResourceType();
+            if (!created && !resourceType.isUpdatable()) {
+                resource.setData(null);
+            }
             PageDataIterable<TbResource> resourcesIterable = new PageDataIterable<>(
                     link -> edgeCtx.getResourceService().findTenantResourcesByResourceTypeAndPageLink(tenantId, resourceType, link), 1024);
             for (TbResource tbResource : resourcesIterable) {
@@ -58,6 +67,7 @@ public abstract class BaseResourceProcessor extends BaseEdgeProcessor {
                 }
             }
             resource.setResourceKey(resourceKey);
+            resourceValidator.validate(resource, TbResourceInfo::getTenantId);
             if (created) {
                 resource.setId(tbResourceId);
             }