diff --git a/SHADE_Engine/src/Physics/System/SHPhysicsSystem.cpp b/SHADE_Engine/src/Physics/System/SHPhysicsSystem.cpp
index 59cd68fb..388adadc 100644
--- a/SHADE_Engine/src/Physics/System/SHPhysicsSystem.cpp
+++ b/SHADE_Engine/src/Physics/System/SHPhysicsSystem.cpp
@@ -38,8 +38,8 @@ namespace SHADE
 
     eventFunctions[0] = { &SHPhysicsSystem::onComponentAdded  , SH_COMPONENT_ADDED_EVENT    };
     eventFunctions[1] = { &SHPhysicsSystem::onComponentRemoved, SH_COMPONENT_REMOVED_EVENT  };
-    eventFunctions[2] = { &SHPhysicsSystem::onSceneInit       , SH_SCENE_ON_INIT_EVENT      };
-    eventFunctions[3] = { &SHPhysicsSystem::onSceneExit       , SH_SCENE_ON_EXIT_EVENT      };
+    eventFunctions[2] = { &SHPhysicsSystem::onSceneInit       , SH_SCENE_INIT_POST          };
+    eventFunctions[3] = { &SHPhysicsSystem::onSceneExit       , SH_SCENE_EXIT_POST          };
 
   #ifdef SHEDITOR
     eventFunctions[4] = { &SHPhysicsSystem::onEditorPlay      , SH_EDITOR_ON_PLAY_EVENT     };
diff --git a/SHADE_Engine/src/Scene/SHSceneManager.cpp b/SHADE_Engine/src/Scene/SHSceneManager.cpp
index d3b84d6a..79e8818a 100644
--- a/SHADE_Engine/src/Scene/SHSceneManager.cpp
+++ b/SHADE_Engine/src/Scene/SHSceneManager.cpp
@@ -62,8 +62,6 @@ namespace SHADE
         SHEventManager::BroadcastEvent<SHSceneInitExitEvent>(exitEvent, SH_SCENE_EXIT_PRE);
 
 				currentScene->Free();
-        SHEventManager::BroadcastEvent<SHSceneExitEvent>(SHSceneExitEvent{ currentSceneID }, SH_SCENE_ON_EXIT_EVENT);
-
 				currentScene->Unload();
 				SHEntityManager::DestroyAllEntity();
 
@@ -112,8 +110,6 @@ namespace SHADE
       SHEventManager::BroadcastEvent<SHSceneInitExitEvent>(exitEvent, SH_SCENE_EXIT_PRE);
 
 			currentScene->Free();
-      SHEventManager::BroadcastEvent<SHSceneExitEvent>(SHSceneExitEvent{ currentSceneID }, SH_SCENE_ON_EXIT_EVENT);
-
 			if (cleanReload == true)
 			{
 				cleanReload = false;