diff --git a/src/Squidex/Pipeline/CommandHandlers/EnrichWithActorHandler.cs b/src/Squidex/Pipeline/CommandHandlers/EnrichWithActorHandler.cs
index fc803043d..316986cc5 100644
--- a/src/Squidex/Pipeline/CommandHandlers/EnrichWithActorHandler.cs
+++ b/src/Squidex/Pipeline/CommandHandlers/EnrichWithActorHandler.cs
@@ -30,7 +30,7 @@ namespace Squidex.Pipeline.CommandHandlers
 
         public Task<bool> HandleAsync(CommandContext context)
         {
-            if (context.Command is SquidexCommand squidexCommand)
+            if (context.Command is SquidexCommand squidexCommand && squidexCommand.Actor == null)
             {
                 var actorToken = 
                     FindActorFromSubject() ?? 
diff --git a/src/Squidex/Pipeline/CommandHandlers/EnrichWithAppIdHandler.cs b/src/Squidex/Pipeline/CommandHandlers/EnrichWithAppIdHandler.cs
index 9a9b5d023..99541301b 100644
--- a/src/Squidex/Pipeline/CommandHandlers/EnrichWithAppIdHandler.cs
+++ b/src/Squidex/Pipeline/CommandHandlers/EnrichWithAppIdHandler.cs
@@ -29,7 +29,7 @@ namespace Squidex.Pipeline.CommandHandlers
 
         public Task<bool> HandleAsync(CommandContext context)
         {
-            if (context.Command is AppCommand appCommand)
+            if (context.Command is AppCommand appCommand && appCommand.AppId == null)
             {
                 var appFeature = httpContextAccessor.HttpContext.Features.Get<IAppFeature>();
 
diff --git a/src/Squidex/Pipeline/CommandHandlers/EnrichWithSchemaIdHandler.cs b/src/Squidex/Pipeline/CommandHandlers/EnrichWithSchemaIdHandler.cs
index dc4dbca93..0b59d46cb 100644
--- a/src/Squidex/Pipeline/CommandHandlers/EnrichWithSchemaIdHandler.cs
+++ b/src/Squidex/Pipeline/CommandHandlers/EnrichWithSchemaIdHandler.cs
@@ -34,7 +34,7 @@ namespace Squidex.Pipeline.CommandHandlers
 
         public async Task<bool> HandleAsync(CommandContext context)
         {
-            if (context.Command is SchemaCommand schemaCommand)
+            if (context.Command is SchemaCommand schemaCommand && schemaCommand.SchemaId == null)
             {
                 var routeValues = actionContextAccessor.ActionContext.RouteData.Values;