diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityEto.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityEto.cs
index aa2a6e1c8f..d5f0a7dc2d 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityEto.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityEto.cs
@@ -5,6 +5,8 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed
     [Serializable]
     public class EntityEto : EtoBase
     {
+        public string EntityType { get; set; }
+
         public string KeysAsString { get; set; }
 
         public EntityEto()
@@ -12,8 +14,9 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed
 
         }
 
-        public EntityEto(string keysAsString)
+        public EntityEto(string entityType, string keysAsString)
         {
+            EntityType = entityType;
             KeysAsString = keysAsString;
         }
     }
diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs
index fd7cab1f4f..5b386599ef 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs
@@ -1,6 +1,5 @@
-using System;
+using Microsoft.Extensions.Options;
 using System.Collections.Generic;
-using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.DynamicProxy;
 using Volo.Abp.EventBus.Distributed;
@@ -28,7 +27,7 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed
             var entity = entityObj as IEntity;
             if (entity == null)
             {
-                throw new ArgumentException($"{nameof(entityObj)} should be an entity and implement the '{typeof(IEntity).AssemblyQualifiedName}' interface!");
+                return null;
             }
 
             var entityType = ProxyHelper.UnProxy(entity).GetType();
@@ -36,7 +35,7 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed
             if (etoType == null)
             {
                 var keys = entity.GetKeys().JoinAsString(",");
-                return new EntityEto(keys);
+                return new EntityEto(entityType.FullName, keys);
             }
 
             //TODO: Also add KeysAsString property to resulting json for compatibility with the EntityEto!
diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/IEntityToEtoMapper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/IEntityToEtoMapper.cs
index e33e6751e8..ceefb311ef 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/IEntityToEtoMapper.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/IEntityToEtoMapper.cs
@@ -1,7 +1,10 @@
-namespace Volo.Abp.Domain.Entities.Events.Distributed
+using JetBrains.Annotations;
+
+namespace Volo.Abp.Domain.Entities.Events.Distributed
 {
     public interface IEntityToEtoMapper
     {
+        [CanBeNull]
         object Map(object entityObj);
     }
 }
diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs
index dc4edea364..06554d451e 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs
@@ -48,35 +48,83 @@ namespace Volo.Abp.Domain.Entities.Events
 
         public virtual async Task TriggerEntityCreatingEventAsync(object entity)
         {
-            await TriggerEventWithEntity(LocalEventBus, typeof(EntityCreatingEventData<>), entity, true);
+            await TriggerEventWithEntity(
+                LocalEventBus,
+                typeof(EntityCreatingEventData<>),
+                entity,
+                true
+            );
         }
 
         public virtual async Task TriggerEntityCreatedEventOnUowCompletedAsync(object entity)
         {
-            await TriggerEventWithEntity(LocalEventBus, typeof(EntityCreatedEventData<>), entity, false);
-            await TriggerEventWithEntity(DistributedEventBus, typeof(EntityCreatedEto<>), EntityToEtoMapper.Map(entity), false);
+            await TriggerEventWithEntity(
+                LocalEventBus,
+                typeof(EntityCreatedEventData<>),
+                entity,
+                false
+            );
+
+            await TriggerEventWithEntity(
+                DistributedEventBus,
+                typeof(EntityCreatedEto<>),
+                EntityToEtoMapper.Map(entity),
+                false
+            );
         }
 
         public virtual async Task TriggerEntityUpdatingEventAsync(object entity)
         {
-            await TriggerEventWithEntity(LocalEventBus, typeof(EntityUpdatingEventData<>), entity, true);
+            await TriggerEventWithEntity(
+                LocalEventBus,
+                typeof(EntityUpdatingEventData<>),
+                entity,
+                true
+            );
         }
 
         public virtual async Task TriggerEntityUpdatedEventOnUowCompletedAsync(object entity)
         {
-            await TriggerEventWithEntity(LocalEventBus, typeof(EntityUpdatedEventData<>), entity, false);
-            await TriggerEventWithEntity(DistributedEventBus, typeof(EntityUpdatedEto<>), EntityToEtoMapper.Map(entity), false);
+            await TriggerEventWithEntity(
+                LocalEventBus,
+                typeof(EntityUpdatedEventData<>),
+                entity,
+                false
+            );
+
+            await TriggerEventWithEntity(
+                DistributedEventBus,
+                typeof(EntityUpdatedEto<>),
+                EntityToEtoMapper.Map(entity),
+                false
+            );
         }
 
         public virtual async Task TriggerEntityDeletingEventAsync(object entity)
         {
-            await TriggerEventWithEntity(LocalEventBus, typeof(EntityDeletingEventData<>), entity, true);
+            await TriggerEventWithEntity(
+                LocalEventBus,
+                typeof(EntityDeletingEventData<>),
+                entity,
+                true
+            );
         }
 
         public virtual async Task TriggerEntityDeletedEventOnUowCompletedAsync(object entity)
         {
-            await TriggerEventWithEntity(LocalEventBus, typeof(EntityDeletedEventData<>), entity, false);
-            await TriggerEventWithEntity(DistributedEventBus, typeof(EntityDeletedEto<>), EntityToEtoMapper.Map(entity), false);
+            await TriggerEventWithEntity(
+                LocalEventBus,
+                typeof(EntityDeletedEventData<>),
+                entity,
+                false
+            );
+
+            await TriggerEventWithEntity(
+                DistributedEventBus,
+                typeof(EntityDeletedEto<>),
+                EntityToEtoMapper.Map(entity),
+                false
+            );
         }
 
         protected virtual async Task TriggerEventsInternalAsync(EntityChangeReport changeReport)