diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index ad1c473bf5..be9a8802fd 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -634,6 +634,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         // Don't send a green dot for yourself
                         if (sp.UUID != remoteClient.AgentId)
                         {
+                            if (!m_showNPCs && sp.PresenceType == PresenceType.Npc)
+                                return;
+
                             mapitem = new mapItemReply(
                                 xstart + (uint)sp.AbsolutePosition.X,
                                 ystart + (uint)sp.AbsolutePosition.Y,