diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 77d747201f..3576a88b7c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4999,8 +4999,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         if (grp.RootPart.Shape.State != 0)
                         {
-                            UUID agentID = grp.OwnerID;
-                            if (agentID == UUID.Zero)
+                            if (grp.RootPart.Shape.PCode == 0 && grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp)))
                             {
                                 objectsToDelete.Add(grp);
                                 return;