diff --git a/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
index 30a68087f9..5df9c1e944 100644
--- a/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
+++ b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
@@ -917,7 +917,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 
         private void OnAvatarEnteringNewParcel(ScenePresence sp, int localLandID, UUID regionID)
         {
-            if (sp.Environment != null)
+            if (sp.Environment != null || sp.IsNPC)
                 return;
 
             if (!m_scene.RegionInfo.EstateSettings.AllowEnvironmentOverride)