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 651339e3a4..11974d2ebc 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
@@ -204,6 +204,9 @@ public class EdgeEventSourcingListener {
                     return false;
             }
         }
+        if (entity instanceof OAuth2Info oAuth2Info) {
+            return oAuth2Info.isEdgeEnabled();
+        }
         // Default: If the entity doesn't match any of the conditions, consider it as valid.
         return true;
     }