diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.cpp b/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.cpp
index db0d733f..8a715a49 100644
--- a/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.cpp
+++ b/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.cpp
@@ -33,18 +33,18 @@ namespace SHADE
 			return;
 		}
 
+    std::vector<SHComponentRemovedEvent> eventVec;
+
 		for (uint32_t i = 0; i < componentSet.Size(); ++i)
 		{
 			SHComponent* comp = (SHComponent*) componentSet.GetElement(i,  EntityHandleGenerator::GetIndex(entityID));
 			if (comp)
 			{
 				comp->OnDestroy();
-
         SHComponentRemovedEvent eventData;
         eventData.eid = entityID;
         eventData.removedComponentType = i;
-
-        SHEventManager::BroadcastEvent<SHComponentRemovedEvent>(eventData, SH_COMPONENT_REMOVED_EVENT);
+        eventVec.push_back(eventData);
 			}
 		}
 
@@ -57,6 +57,12 @@ namespace SHADE
 
 		componentSet.RemoveElements(EntityHandleGenerator::GetIndex(entityID));
 
+    for (auto& eventData : eventVec)
+    {
+      SHEventManager::BroadcastEvent<SHComponentRemovedEvent>(eventData, SH_COMPONENT_REMOVED_EVENT);
+    }
+
+
 		//entityHandle.RemoveHandle(entityID);