diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index a5203ea750..99e50ac72d 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -442,15 +442,12 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                 // Dont process if this message is from yourself!
                 if (liHostID.Equals(id))
                     continue;
-
+                if (!liHostID.Equals(target))
+                    continue;
                 if (m_scene.GetSceneObjectPart(liHostID) == null)
                     continue;
 
-                if (liHostID.Equals(target))
-                {
-                    QueueMessage(new ListenerInfo(li, name, id, msg));
-                    break;
-                }
+                QueueMessage(new ListenerInfo(li, name, id, msg));
             }
         }