diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index cd9dcf58fc..dff582b8c3 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1855,7 +1855,12 @@ namespace OpenSim.Region.Framework.Scenes
                         // Util.FireAndForget(
                         //      o =>
                         //      {
-                            Scene.AttachmentsModule.RezAttachments(this);
+                            if (!isNPC)
+                                Scene.AttachmentsModule.RezAttachments(this);
+                            else
+                                Util.FireAndForget(x => {
+                                    Scene.AttachmentsModule.RezAttachments(this);
+                                });
                         // });
                     }
                     else