diff --git a/src/Arch/Core/Events/World.Events.cs b/src/Arch/Core/Events/World.Events.cs
index 58e69e4e..890118a2 100644
--- a/src/Arch/Core/Events/World.Events.cs
+++ b/src/Arch/Core/Events/World.Events.cs
@@ -325,12 +325,12 @@ public void OnComponentAdded(Entity entity, ComponentType compType)
     ///     Calls all handlers subscribed to component setting of this type.
     /// </summary>
     /// <param name="entity">The entity that the component was set on.</param>
-    /// <param name="comp">The component instance that got set.</param>
+    /// <param name="compType">The type of component that got set.</param>
 
-    public void OnComponentSet(Entity entity, object comp)
+    public void OnComponentSet(Entity entity, ComponentType compType)
     {
 #if EVENTS
-        var events = GetEvents(comp.GetType());
+        var events = GetEvents(compType);
         if (events == null)
         {
             return;
diff --git a/src/Arch/Core/World.cs b/src/Arch/Core/World.cs
index 9fdeb4b7..d544b1b2 100644
--- a/src/Arch/Core/World.cs
+++ b/src/Arch/Core/World.cs
@@ -1296,7 +1296,7 @@ public void Set(Entity entity, object component)
     {
         var entitySlot = EntityInfo.GetEntityData(entity.Id);
         entitySlot.Archetype.Set(ref entitySlot.Slot, component);
-        OnComponentSet(entity, component);
+        OnComponentSet(entity, (ComponentType)component.GetType());
     }
 
     /// <summary>
@@ -1311,7 +1311,7 @@ public void SetRange(Entity entity, Span<object> components)
         foreach (var cmp in components)
         {
             entitySlot.Archetype.Set(ref entitySlot.Slot, cmp);
-            OnComponentSet(entity, cmp);
+            OnComponentSet(entity, (ComponentType)cmp.GetType());
         }
     }