diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index eca9c3b234..83beff4692 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -468,6 +468,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
///
private void UpdateKnownItem(IScenePresence sp, SceneObjectGroup grp)
{
+ // Saving attachments for NPCs messes them up for the real owner!
+ INPCModule module = m_scene.RequestModuleInterface();
+ if (module != null)
+ {
+ if (module.IsNPC(sp.UUID, m_scene))
+ return;
+ }
+
if (grp.HasGroupChanged || grp.ContainsScripts())
{
m_log.DebugFormat(