diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs
index b6f88748bb..6fe11d8113 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs
@@ -215,6 +215,9 @@ namespace OpenSim.Region.ScriptEngine.Yengine
          */
         public void ApiReset()
         {
+            // do not do llResetScript on entry
+            if(eventCode == ScriptEventCode.state_entry && stateCode == 0)
+                return;
             ClearQueueExceptLinkMessages();
             throw new ScriptResetException();
         }