diff --git a/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java b/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
index 6c2f81a200..d975217e1f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
@@ -160,39 +160,41 @@ public class EdgeEventSourcingListener {
     private boolean isValidSaveEntityEventForEdgeProcessing(SaveEntityEvent<?> event) {
         Object entity = event.getEntity();
         Object oldEntity = event.getOldEntity();
-        switch (event.getEntityId().getEntityType()) {
-            case RULE_CHAIN:
-                if (entity instanceof RuleChain ruleChain) {
-                    return RuleChainType.EDGE.equals(ruleChain.getType());
-                }
-                break;
-            case USER:
-                if (entity instanceof User user) {
-                    if (Authority.SYS_ADMIN.equals(user.getAuthority())) {
+        if (event.getEntityId() != null) {
+            switch (event.getEntityId().getEntityType()) {
+                case RULE_CHAIN:
+                    if (entity instanceof RuleChain ruleChain) {
+                        return RuleChainType.EDGE.equals(ruleChain.getType());
+                    }
+                    break;
+                case USER:
+                    if (entity instanceof User user) {
+                        if (Authority.SYS_ADMIN.equals(user.getAuthority())) {
+                            return false;
+                        }
+                        if (oldEntity != null) {
+                            User oldUser = (User) oldEntity;
+                            cleanUpUserAdditionalInfo(oldUser);
+                            cleanUpUserAdditionalInfo(user);
+                            return !user.equals(oldUser);
+                        }
+                    }
+                    break;
+                case OTA_PACKAGE:
+                    if (entity instanceof OtaPackageInfo otaPackageInfo) {
+                        return otaPackageInfo.hasUrl() || otaPackageInfo.isHasData();
+                    }
+                    break;
+                case ALARM:
+                    if (entity instanceof AlarmApiCallResult || entity instanceof Alarm) {
                         return false;
                     }
-                    if (oldEntity != null) {
-                        User oldUser = (User) oldEntity;
-                        cleanUpUserAdditionalInfo(oldUser);
-                        cleanUpUserAdditionalInfo(user);
-                        return !user.equals(oldUser);
-                    }
-                }
-                break;
-            case OTA_PACKAGE:
-                if (entity instanceof OtaPackageInfo otaPackageInfo) {
-                    return otaPackageInfo.hasUrl() || otaPackageInfo.isHasData();
-                }
-                break;
-            case ALARM:
-                if (entity instanceof AlarmApiCallResult || entity instanceof Alarm) {
+                    break;
+                case TENANT:
+                    return !event.getCreated();
+                case API_USAGE_STATE, EDGE:
                     return false;
-                }
-                break;
-            case TENANT:
-                return !event.getCreated();
-            case API_USAGE_STATE, EDGE:
-                return false;
+            }
         }
         // Default: If the entity doesn't match any of the conditions, consider it as valid.
         return true;
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/oauth2/OAuth2EdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/oauth2/OAuth2EdgeProcessor.java
index 1c62ad5de8..ce0600b491 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/oauth2/OAuth2EdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/oauth2/OAuth2EdgeProcessor.java
@@ -55,7 +55,6 @@ public class OAuth2EdgeProcessor extends BaseEdgeProcessor {
         if (oAuth2Info == null) {
             return Futures.immediateFuture(null);
         }
-
         EdgeEventType type = EdgeEventType.valueOf(edgeNotificationMsg.getType());
         EdgeEventActionType actionType = EdgeEventActionType.valueOf(edgeNotificationMsg.getAction());
         return processActionForAllEdges(tenantId, type, actionType, null, JacksonUtil.toJsonNode(edgeNotificationMsg.getBody()), null);
diff --git a/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java
index 0787d08fa7..e7f664477c 100644
--- a/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java
@@ -63,6 +63,7 @@ import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.oauth2.OAuth2Info;
 import org.thingsboard.server.common.data.ota.ChecksumAlgorithm;
 import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.page.PageData;
@@ -85,6 +86,7 @@ import org.thingsboard.server.gen.edge.v1.CustomerUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.DeviceProfileUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.DeviceUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.EdgeConfiguration;
+import org.thingsboard.server.gen.edge.v1.OAuth2UpdateMsg;
 import org.thingsboard.server.gen.edge.v1.QueueUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.RuleChainMetadataRequestMsg;
 import org.thingsboard.server.gen.edge.v1.RuleChainMetadataUpdateMsg;
@@ -140,6 +142,7 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
         installation();
 
         edgeImitator = new EdgeImitator("localhost", 7070, edge.getRoutingKey(), edge.getSecret());
+        edgeImitator.ignoreType(OAuth2UpdateMsg.class);
         edgeImitator.expectMessageAmount(21);
         edgeImitator.connect();
 
@@ -538,6 +541,18 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
         Assert.assertTrue(customer.isPublic());
     }
 
+    private void validateOAuth2() throws Exception {
+        Optional<OAuth2UpdateMsg> oAuth2UpdateMsgOpt = edgeImitator.findMessageByType(OAuth2UpdateMsg.class);
+        Assert.assertTrue(oAuth2UpdateMsgOpt.isPresent());
+        OAuth2UpdateMsg oAuth2UpdateMsg = oAuth2UpdateMsgOpt.get();
+        OAuth2Info oAuth2Info = JacksonUtil.fromString(oAuth2UpdateMsg.getEntity(), OAuth2Info.class, true);
+        Assert.assertNotNull(oAuth2Info);
+        OAuth2Info auth2Info = doGet("/api/oauth2/config", OAuth2Info.class);
+        Assert.assertNotNull(auth2Info);
+        Assert.assertEquals(oAuth2Info, auth2Info);
+        testAutoGeneratedCodeByProtobuf(oAuth2UpdateMsg);
+    }
+
     private void validateSyncCompleted() {
         Optional<SyncCompletedMsg> syncCompletedMsgOpt = edgeImitator.findMessageByType(SyncCompletedMsg.class);
         Assert.assertTrue(syncCompletedMsgOpt.isPresent());
diff --git a/application/src/test/java/org/thingsboard/server/edge/OAuth2EdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/OAuth2EdgeTest.java
index b3cc133f4b..b5ed5e788c 100644
--- a/application/src/test/java/org/thingsboard/server/edge/OAuth2EdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/OAuth2EdgeTest.java
@@ -43,6 +43,7 @@ public class OAuth2EdgeTest extends AbstractEdgeTest {
         loginSysAdmin();
 
         // enable oauth, verify nothing sent to edge
+        edgeImitator.allowIgnoredTypes();
         edgeImitator.expectMessageAmount(1);
         OAuth2Info oAuth2Info = createDefaultOAuth2Info();
         oAuth2Info = doPost("/api/oauth2/config", oAuth2Info, OAuth2Info.class);
@@ -65,6 +66,7 @@ public class OAuth2EdgeTest extends AbstractEdgeTest {
         result = JacksonUtil.fromString(oAuth2UpdateMsg.getEntity(), OAuth2Info.class, true);
         Assert.assertEquals(oAuth2Info, result);
 
+        edgeImitator.ignoreType(OAuth2UpdateMsg.class);
         loginTenantAdmin();
     }