diff --git a/SHADE_Engine/src/Physics/Collision/SHCollisionListener.cpp b/SHADE_Engine/src/Physics/Collision/SHCollisionListener.cpp
index 11a3f754..3e485153 100644
--- a/SHADE_Engine/src/Physics/Collision/SHCollisionListener.cpp
+++ b/SHADE_Engine/src/Physics/Collision/SHCollisionListener.cpp
@@ -84,14 +84,27 @@ namespace SHADE
       {
         const SHCollisionInfo& C_INFO = *eventIter;
 
-        const bool CLEAR_EVENT      = C_INFO.GetCollisionState() == SHCollisionInfo::State::EXIT ||  C_INFO.GetCollisionState() == SHCollisionInfo::State::INVALID;
         const bool INVALID_ENTITY   = !SHEntityManager::IsValidEID(C_INFO.GetEntityA()) || !SHEntityManager::IsValidEID(C_INFO.GetEntityB());
-        const bool INACTIVE_OBJECT  = !SHSceneManager::CheckNodeAndComponentsActive<SHColliderComponent>(C_INFO.GetEntityA()) ||  !SHSceneManager::CheckNodeAndComponentsActive<SHColliderComponent>(C_INFO.GetEntityB());
-
-        if (CLEAR_EVENT || INVALID_ENTITY || INACTIVE_OBJECT)
+        if (INVALID_ENTITY)
+        {
           eventIter = container.erase(eventIter);
+          continue;
+        }
         else
-          ++eventIter;
+        {
+          const bool CLEAR_EVENT      = C_INFO.GetCollisionState() == SHCollisionInfo::State::EXIT ||  C_INFO.GetCollisionState() == SHCollisionInfo::State::INVALID;
+
+          const bool INACTIVE_OBJECT  = !SHSceneManager::CheckNodeAndComponentsActive<SHColliderComponent>(C_INFO.GetEntityA())
+                                    ||  !SHSceneManager::CheckNodeAndComponentsActive<SHColliderComponent>(C_INFO.GetEntityB());
+
+          if (CLEAR_EVENT || INACTIVE_OBJECT)
+          {
+            eventIter = container.erase(eventIter);
+            continue;
+          }
+        }
+
+        ++eventIter;
       }
     };