diff --git a/src/core/Elsa.Abstractions/Models/WorkflowExecutionLogRecord.cs b/src/core/Elsa.Abstractions/Models/WorkflowExecutionLogRecord.cs
index 4b2ea4804..04f1769e8 100644
--- a/src/core/Elsa.Abstractions/Models/WorkflowExecutionLogRecord.cs
+++ b/src/core/Elsa.Abstractions/Models/WorkflowExecutionLogRecord.cs
@@ -20,7 +20,7 @@ namespace Elsa.Models
             Data = data;
         }
         
-        public string? TenantId { get; }
+        public string? TenantId { get; private set; }
         public string WorkflowInstanceId { get; set; } = default!;
         public string ActivityId { get; set; } = default!;
         public Instant Timestamp { get; set; }= default!;
diff --git a/src/persistence/Elsa.Persistence.MongoDb/Services/DatabaseRegister.cs b/src/persistence/Elsa.Persistence.MongoDb/Services/DatabaseRegister.cs
index 93271b377..b9184a43f 100644
--- a/src/persistence/Elsa.Persistence.MongoDb/Services/DatabaseRegister.cs
+++ b/src/persistence/Elsa.Persistence.MongoDb/Services/DatabaseRegister.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Security.Cryptography.X509Certificates;
 using Elsa.Models;
 using Elsa.Persistence.MongoDb.Serializers;
 using MongoDb.Bson.NodaTime;
@@ -22,22 +23,25 @@ namespace Elsa.Persistence.MongoDb.Services
 
         private static bool Map()
         {
-            if (BsonClassMap.IsClassMapRegistered(typeof(WorkflowDefinition)))
+            if (BsonClassMap.IsClassMapRegistered(typeof(Entity)))
                 return false;
 
             try
             {
+                BsonClassMap.RegisterClassMap<Entity>(cm =>
+                {
+                    cm.SetIsRootClass(true);
+                    cm.MapIdProperty(x => x.Id);
+                });
 
                 BsonClassMap.RegisterClassMap<WorkflowDefinition>(cm =>
                 {
-                    cm.AutoMap();
-                    cm.MapIdMember(x => x.Id);
+                    cm.AutoMap();                  
                 });
 
                 BsonClassMap.RegisterClassMap<WorkflowInstance>(cm =>
                 {
-                    cm.AutoMap();
-                    cm.MapIdMember(x => x.Id);
+                    cm.AutoMap();                   
                 });
 
             }