diff --git a/src/Squidex.Infrastructure.Redis/RedisSubscription.cs b/src/Squidex.Infrastructure.Redis/RedisSubscription.cs
index 9fbbacad1..1a9d72b1f 100644
--- a/src/Squidex.Infrastructure.Redis/RedisSubscription.cs
+++ b/src/Squidex.Infrastructure.Redis/RedisSubscription.cs
@@ -45,7 +45,9 @@ namespace Squidex.Infrastructure
         {
             try
             {
-                var envelope = JsonConvert.SerializeObject(new Envelope { Sender = selfId, Payload = (T)value });
+                var senderId = notifySelf ? Guid.Empty : selfId;
+
+                var envelope = JsonConvert.SerializeObject(new Envelope { Sender = senderId, Payload = (T)value });
 
                 subscriber.Publish(channelName, envelope);
             }
diff --git a/src/Squidex.Infrastructure/States/StatefulObject.cs b/src/Squidex.Infrastructure/States/StatefulObject.cs
index b384c09e4..f6fa8c677 100644
--- a/src/Squidex.Infrastructure/States/StatefulObject.cs
+++ b/src/Squidex.Infrastructure/States/StatefulObject.cs
@@ -43,7 +43,7 @@ namespace Squidex.Infrastructure.States
 
             this.stateHolder = stateHolder;
 
-            return stateHolder.ReadAsync();
+            return ReadStateAsync();
         }
 
         public virtual async Task ReadStateAsync()