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 ac7bd6768c..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
@@ -53,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) {
diff --git a/application/src/test/java/org/thingsboard/server/edge/ResourceEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/ResourceEdgeTest.java
index c27489d207..cc5aa4da0e 100644
--- a/application/src/test/java/org/thingsboard/server/edge/ResourceEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/ResourceEdgeTest.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.edge;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.InvalidProtocolBufferException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.thingsboard.common.util.JacksonUtil;
@@ -98,30 +99,23 @@ public class ResourceEdgeTest extends AbstractEdgeTest {
     public void testSendResourceToCloud() throws Exception {
         TbResource tbResource = createTbResource();
         UUID uuid = Uuids.timeBased();
+        UplinkMsg uplinkMsg = getUplinkMsg(uuid, tbResource, UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE);
 
-        UplinkMsg.Builder uplinkMsgBuilder = UplinkMsg.newBuilder();
-        ResourceUpdateMsg.Builder resourceUpdateMsgBuilder = ResourceUpdateMsg.newBuilder();
-        resourceUpdateMsgBuilder.setIdMSB(uuid.getMostSignificantBits());
-        resourceUpdateMsgBuilder.setIdLSB(uuid.getLeastSignificantBits());
-        resourceUpdateMsgBuilder.setEntity(JacksonUtil.toString(tbResource));
-        resourceUpdateMsgBuilder.setMsgType(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE);
-        testAutoGeneratedCodeByProtobuf(resourceUpdateMsgBuilder);
-        uplinkMsgBuilder.addResourceUpdateMsg(resourceUpdateMsgBuilder.build());
+        checkResourceOnCloud(uplinkMsg, uuid, tbResource.getTitle());
+    }
 
-        testAutoGeneratedCodeByProtobuf(uplinkMsgBuilder);
+    @Test
+    public void testUpdateResourceTitleOnCloud() throws Exception {
+        TbResource tbResource = createTbResource();
+        UUID uuid = Uuids.timeBased();
+        UplinkMsg uplinkMsg = getUplinkMsg(uuid, tbResource, UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE);
 
-        edgeImitator.expectResponsesAmount(1);
-        edgeImitator.sendUplinkMsg(uplinkMsgBuilder.build());
+        checkResourceOnCloud(uplinkMsg, uuid, tbResource.getTitle());
 
-        Assert.assertTrue(edgeImitator.waitForResponses());
+        tbResource.setTitle("Updated Edge Test Resource");
+        UplinkMsg updatedUplinkMsg = getUplinkMsg(uuid, tbResource, UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE);
 
-        UplinkResponseMsg latestResponseMsg = edgeImitator.getLatestResponseMsg();
-        Assert.assertTrue(latestResponseMsg.getSuccess());
-
-        TbResource tb = doGet("/api/resource/" + uuid, TbResource.class);
-        Assert.assertNotNull(tb);
-        Assert.assertEquals("Edge Test Resource", tb.getName());
-        Assert.assertEquals(TEST_DATA, tb.getEncodedData());
+        checkResourceOnCloud(updatedUplinkMsg, uuid, tbResource.getTitle());
     }
 
     @Test
@@ -134,21 +128,12 @@ public class ResourceEdgeTest extends AbstractEdgeTest {
 
         UUID uuid = Uuids.timeBased();
 
-        UplinkMsg.Builder uplinkMsgBuilder = UplinkMsg.newBuilder();
-        ResourceUpdateMsg.Builder resourceUpdateMsgBuilder = ResourceUpdateMsg.newBuilder();
-        resourceUpdateMsgBuilder.setIdMSB(uuid.getMostSignificantBits());
-        resourceUpdateMsgBuilder.setIdLSB(uuid.getLeastSignificantBits());
-        resourceUpdateMsgBuilder.setEntity(JacksonUtil.toString(resource));
-        resourceUpdateMsgBuilder.setMsgType(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE);
-        testAutoGeneratedCodeByProtobuf(resourceUpdateMsgBuilder);
-        uplinkMsgBuilder.addResourceUpdateMsg(resourceUpdateMsgBuilder.build());
-
-        testAutoGeneratedCodeByProtobuf(uplinkMsgBuilder);
+        UplinkMsg uplinkMsg = getUplinkMsg(uuid, resource, UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE);
 
         edgeImitator.expectResponsesAmount(1);
         edgeImitator.expectMessageAmount(1);
 
-        edgeImitator.sendUplinkMsg(uplinkMsgBuilder.build());
+        edgeImitator.sendUplinkMsg(uplinkMsg);
 
         Assert.assertTrue(edgeImitator.waitForResponses());
         Assert.assertTrue(edgeImitator.waitForMessages());
@@ -177,4 +162,35 @@ public class ResourceEdgeTest extends AbstractEdgeTest {
         tbResource.setEncodedData(TEST_DATA);
         return tbResource;
     }
+
+    private UplinkMsg getUplinkMsg(UUID uuid, TbResource tbResource, UpdateMsgType updateMsgType) throws InvalidProtocolBufferException {
+        UplinkMsg.Builder uplinkMsgBuilder = UplinkMsg.newBuilder();
+        ResourceUpdateMsg.Builder resourceUpdateMsgBuilder = ResourceUpdateMsg.newBuilder();
+        resourceUpdateMsgBuilder.setIdMSB(uuid.getMostSignificantBits());
+        resourceUpdateMsgBuilder.setIdLSB(uuid.getLeastSignificantBits());
+        resourceUpdateMsgBuilder.setEntity(JacksonUtil.toString(tbResource));
+        resourceUpdateMsgBuilder.setMsgType(updateMsgType);
+        testAutoGeneratedCodeByProtobuf(resourceUpdateMsgBuilder);
+        uplinkMsgBuilder.addResourceUpdateMsg(resourceUpdateMsgBuilder.build());
+
+        testAutoGeneratedCodeByProtobuf(uplinkMsgBuilder);
+
+        return uplinkMsgBuilder.build();
+    }
+
+    private void checkResourceOnCloud(UplinkMsg uplinkMsg, UUID uuid, String resourceTitle) throws Exception {
+        edgeImitator.expectResponsesAmount(1);
+        edgeImitator.sendUplinkMsg(uplinkMsg);
+
+        Assert.assertTrue(edgeImitator.waitForResponses());
+
+        UplinkResponseMsg latestResponseMsg = edgeImitator.getLatestResponseMsg();
+        Assert.assertTrue(latestResponseMsg.getSuccess());
+
+        TbResource tb = doGet("/api/resource/" + uuid, TbResource.class);
+        Assert.assertNotNull(tb);
+        Assert.assertEquals(resourceTitle, tb.getName());
+        Assert.assertEquals(TEST_DATA, tb.getEncodedData());
+    }
+
 }