diff --git a/src/Squidex.Infrastructure/Commands/DomainObjectGrainBase.cs b/src/Squidex.Infrastructure/Commands/DomainObjectGrainBase.cs
index 75b018bf4..1f6044d3d 100644
--- a/src/Squidex.Infrastructure/Commands/DomainObjectGrainBase.cs
+++ b/src/Squidex.Infrastructure/Commands/DomainObjectGrainBase.cs
@@ -185,7 +185,7 @@ namespace Squidex.Infrastructure.Commands
 
                 if (result == null)
                 {
-                    if (Version > 0)
+                    if (mode == Mode.Update || (mode == Mode.Upsert && Version == 0))
                     {
                         result = new EntitySavedResult(Version);
                     }