diff --git a/SHADE_Engine/src/Scripting/SHScriptEngine.cpp b/SHADE_Engine/src/Scripting/SHScriptEngine.cpp
index 0db11c7a..e0b87bea 100644
--- a/SHADE_Engine/src/Scripting/SHScriptEngine.cpp
+++ b/SHADE_Engine/src/Scripting/SHScriptEngine.cpp
@@ -307,7 +307,7 @@ namespace SHADE
   SHEventHandle SHScriptEngine::onEntityDestroyed(SHEventPtr eventPtr)
   {
     auto eventData = reinterpret_cast<const SHEventSpec<SHEntityDestroyedEvent>*>(eventPtr.get());
-    csScriptsRemoveAll(eventData->data->eid);
+    csScriptsRemoveAllImmediately(eventData->data->eid, true);
     return eventData->handle;
   }
 
diff --git a/SHADE_Managed/src/Scripts/ScriptStore.cxx b/SHADE_Managed/src/Scripts/ScriptStore.cxx
index d57122ee..29ba6e52 100644
--- a/SHADE_Managed/src/Scripts/ScriptStore.cxx
+++ b/SHADE_Managed/src/Scripts/ScriptStore.cxx
@@ -402,8 +402,8 @@ namespace SHADE
         System::Collections::Generic::List<Script^>^ scriptList = scripts[entity];
         for each (Script ^ script in scriptList)
         {
-            // Call OnDestroy only if indicated and also in play mode
-            if (callOnDestroy)
+            // Call OnDestroy only if indicated and also if the game has run
+            if (callOnDestroy && Application::IsPlaying || Application::IsPaused)
             {
                 script->OnDestroy();
             }
@@ -469,7 +469,7 @@ namespace SHADE
                 script->OnDestroy();
             }
             auto entity = script->Owner.GetEntity();
-            auto scriptList = scripts[script->Owner.GetEntity()];
+            auto scriptList = scripts[script->Owner.GetEntity()]; // Unable to find here
             scriptList->Remove(script);
             if (scriptList->Count <= 0)
             {