diff --git a/src/persistence/Elsa.Persistence.YesSql/Mapping/AutoMapperProfile.cs b/src/persistence/Elsa.Persistence.YesSql/Mapping/AutoMapperProfile.cs
index 8ce875c5e..de48ac3f9 100644
--- a/src/persistence/Elsa.Persistence.YesSql/Mapping/AutoMapperProfile.cs
+++ b/src/persistence/Elsa.Persistence.YesSql/Mapping/AutoMapperProfile.cs
@@ -8,8 +8,17 @@ namespace Elsa.Persistence.YesSql.Mapping
     {
         public AutoMapperProfile()
         {
-            CreateMap<WorkflowInstance, WorkflowInstanceDocument>().ReverseMap();
-            CreateMap<WorkflowDefinition, WorkflowDefinitionDocument>().ReverseMap();
+            CreateMap<WorkflowInstance, WorkflowInstanceDocument>()
+                .ForMember(d => d.InstanceId, d => d.MapFrom(s => s.Id))
+                .ForMember(d => d.Id, d => d.Ignore())
+                .ReverseMap()
+                .ForMember(d => d.Id, d => d.MapFrom(s => s.InstanceId));
+            
+            CreateMap<WorkflowDefinition, WorkflowDefinitionDocument>()
+                .ForMember(d => d.DefinitionId, d => d.MapFrom(s => s.Id))
+                .ForMember(d => d.Id, d => d.Ignore())
+                .ReverseMap()
+                .ForMember(d => d.Id, d => d.MapFrom(s => s.DefinitionId));
         }
     }
 }
\ No newline at end of file