diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 1a64595a2b..83751cf216 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1440,10 +1440,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 m_Scripts.Remove(itemID);
             }
 
-
-            instance.ClearQueue();
-
-            instance.Stop(m_WaitForEventCompletionOnScriptStop);
+            instance.Stop(m_WaitForEventCompletionOnScriptStop, true);
 
 //                bool objectRemoved = false;