diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 47bf608a02..989df44381 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -276,6 +276,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
         {
             if(sp.IsDeleted || sp.IsChildAgent)
                 return;
+            if (sp.IsNPC)
+            {
+                INPCModule npcmodule = sp.Scene.RequestModuleInterface<INPCModule>();
+                if (npcmodule != null)
+                {
+                    npcmodule.DeleteNPC(sp.UUID, sp.Scene);
+                    return;
+                }
+            }
             sp.ControllingClient.Kick(reason);
             sp.Scene.CloseAgent(sp.UUID, true);
         }
@@ -311,6 +320,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
                 return;
             }
 
+            if (sp.IsNPC)
+            {
+                INPCModule npcmodule = sp.Scene.RequestModuleInterface<INPCModule>();
+                if (npcmodule != null)
+                {
+                    npcmodule.DeleteNPC(sp.UUID, sp.Scene);
+                    return;
+                }
+            }
             sp.ControllingClient.Kick(reason);
             sp.Scene.CloseAgent(sp.UUID, true);
         }