diff --git a/src/Squidex/Pipeline/EntityCreatedDto.cs b/src/Squidex/Pipeline/EntityCreatedDto.cs
index 400cf3be8..9b768e652 100644
--- a/src/Squidex/Pipeline/EntityCreatedDto.cs
+++ b/src/Squidex/Pipeline/EntityCreatedDto.cs
@@ -25,7 +25,7 @@ namespace Squidex.Pipeline
 
         public static EntityCreatedDto FromResult<T>(EntityCreatedResult<T> result)
         {
-            return new EntityCreatedDto { Id = result.ToString(), Version = result.Version };
+            return new EntityCreatedDto { Id = result.IdOrValue?.ToString(), Version = result.Version };
         }
     }
 }