diff --git a/zone/npc.cpp b/zone/npc.cpp
index be1be1ebd..1a69dc95c 100644
--- a/zone/npc.cpp
+++ b/zone/npc.cpp
@@ -1136,39 +1136,87 @@ uint32 ZoneDatabase::UpdateNPCTypeAppearance(Client *client, NPC* spawn) {
 }
 
 uint32 ZoneDatabase::DeleteSpawnLeaveInNPCTypeTable(const char* zone, Client *client, NPC* spawn) {
+	uint32 id = 0;
+	uint32 spawngroupID = 0;
+
+	std::string query = StringFormat("SELECT id, spawngroupID FROM spawn2 WHERE "
+                                    "zone='%s' AND spawngroupID=%i", zone, spawn->GetSp2());
+    auto results = QueryDatabase(query);
+    if (!results.Success())
+		return 0;
+
+    if (results.RowCount() == 0)
+        return 0;
+
+	auto row = results.begin();
+	if (row[0])
+        id = atoi(row[0]);
+
+	if (row[1])
+        spawngroupID = atoi(row[1]);
+
+    query = StringFormat("DELETE FROM spawn2 WHERE id = '%i'", id);
+    results = QueryDatabase(query);
+	if (!results.Success())
+		return 0;
+
+	if(client)
+        client->LogSQL(query.c_str());
+
+    query = StringFormat("DELETE FROM spawngroup WHERE id = '%i'", spawngroupID);
+    results = QueryDatabase(query);
+	if (!results.Success())
+		return 0;
+
+	if(client)
+        client->LogSQL(query.c_str());
+
+    query = StringFormat("DELETE FROM spawnentry WHERE spawngroupID = '%i'", spawngroupID);
+    results = QueryDatabase(query);
+	if (!results.Success())
+		return 0;
+
+	if(client)
+        client->LogSQL(query.c_str());
+
+	return 1;
+}
+
+uint32 ZoneDatabase::DeleteSpawnRemoveFromNPCTypeTable(const char* zone, uint32 zone_version, Client *client, NPC* spawn) {
     char errbuf[MYSQL_ERRMSG_SIZE];
 	char *query = 0;
 	MYSQL_RES *result;
 	MYSQL_ROW row;
 	uint32 tmp = 0;
 	uint32 tmp2 = 0;
-    if (!RunQuery(query, MakeAnyLenString(&query, "SELECT id,spawngroupID from spawn2 where zone='%s' AND spawngroupID=%i", zone, spawn->GetSp2()), errbuf, &result)) {
+    if (!RunQuery(query, MakeAnyLenString(&query, "SELECT id,spawngroupID from spawn2 where zone='%s' AND version=%u AND spawngroupID=%i", zone, zone_version, spawn->GetSp2()), errbuf, &result)) {
 		safe_delete_array(query);
-		return 0;
+		return(0);
 	}
 	safe_delete_array(query);
 
 	row = mysql_fetch_row(result);
+
 	if (row == nullptr)
-        return 0;
+        return false;
 	if (row[0])
         tmp = atoi(row[0]);
 	if (row[1])
         tmp2 = atoi(row[1]);
+	mysql_free_result(result);
 
 	if (!RunQuery(query, MakeAnyLenString(&query, "DELETE FROM spawn2 WHERE id='%i'", tmp), errbuf,0)) {
 		safe_delete(query);
-		return 0;
+		return false;
 	}
 
 	if(client)
         client->LogSQL(query);
 
-	safe_delete_array(query);
-
+    safe_delete_array(query);
 	if (!RunQuery(query, MakeAnyLenString(&query, "DELETE FROM spawngroup WHERE id='%i'", tmp2), errbuf,0)) {
 		safe_delete(query);
-		return 0;
+		return false;
 	}
 
 	if(client)
@@ -1177,14 +1225,23 @@ uint32 ZoneDatabase::DeleteSpawnLeaveInNPCTypeTable(const char* zone, Client *cl
 	safe_delete_array(query);
 	if (!RunQuery(query, MakeAnyLenString(&query, "DELETE FROM spawnentry WHERE spawngroupID='%i'", tmp2), errbuf,0)) {
 		safe_delete(query);
-		return 0;
+		return false;
 	}
 
 	if(client)
         client->LogSQL(query);
 
-	safe_delete_array(query);
-	return 1;
+    safe_delete_array(query);
+	if (!RunQuery(query, MakeAnyLenString(&query, "DELETE FROM npc_types WHERE id='%i'", spawn->GetNPCTypeID()), errbuf,0)) {
+		safe_delete(query);
+		return false;
+	}
+
+	if(client)
+        client->LogSQL(query);
+
+    safe_delete_array(query);
+	return true;
 }
 
 uint32 ZoneDatabase::NPCSpawnDB(uint8 command, const char* zone, uint32 zone_version, Client *c, NPC* spawn, uint32 extra) {
@@ -1209,44 +1266,7 @@ uint32 ZoneDatabase::NPCSpawnDB(uint8 command, const char* zone, uint32 zone_ver
 			return DeleteSpawnLeaveInNPCTypeTable(zone, c, spawn);
 		}
 		case 4: { //delete spawn from DB (including npc_type)
-			if (!RunQuery(query, MakeAnyLenString(&query, "SELECT id,spawngroupID from spawn2 where zone='%s' AND version=%u AND spawngroupID=%i", zone, zone_version, spawn->GetSp2()), errbuf, &result)) {
-				safe_delete_array(query);
-				return(0);
-			}
-			safe_delete_array(query);
-
-			row = mysql_fetch_row(result);
-			if (row == nullptr) return false;
-			if (row[0]) tmp = atoi(row[0]);
-			if (row[1]) tmp2 = atoi(row[1]);
-			mysql_free_result(result);
-
-			if (!RunQuery(query, MakeAnyLenString(&query, "DELETE FROM spawn2 WHERE id='%i'", tmp), errbuf,0)) {
-				safe_delete(query);
-				return false;
-			}
-			if(c) c->LogSQL(query);
-			safe_delete_array(query);
-			if (!RunQuery(query, MakeAnyLenString(&query, "DELETE FROM spawngroup WHERE id='%i'", tmp2), errbuf,0)) {
-				safe_delete(query);
-				return false;
-			}
-			if(c) c->LogSQL(query);
-			safe_delete_array(query);
-			if (!RunQuery(query, MakeAnyLenString(&query, "DELETE FROM spawnentry WHERE spawngroupID='%i'", tmp2), errbuf,0)) {
-				safe_delete(query);
-				return false;
-			}
-			if(c) c->LogSQL(query);
-			safe_delete_array(query);
-			if (!RunQuery(query, MakeAnyLenString(&query, "DELETE FROM npc_types WHERE id='%i'", spawn->GetNPCTypeID()), errbuf,0)) {
-				safe_delete(query);
-				return false;
-			}
-			if(c) c->LogSQL(query);
-			safe_delete_array(query);
-			return true;
-			break;
+			return DeleteSpawnRemoveFromNPCTypeTable(zone, zone_version, c, spawn);
 		}
 		case 5: { // add a spawn from spawngroup
 			if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO spawn2 (zone, version, x, y, z, respawntime, heading, spawngroupID) values('%s', %u, %f, %f, %f, %i, %f, %i)", zone, zone_version, c->GetX(), c->GetY(), c->GetZ(), 120, c->GetHeading(), extra), errbuf, 0, 0, &tmp)) {
diff --git a/zone/zonedb.h b/zone/zonedb.h
index 74a1b9797..80ad6133c 100644
--- a/zone/zonedb.h
+++ b/zone/zonedb.h
@@ -375,6 +375,7 @@ public:
     uint32  CreateNewNPCCommand(const char* zone, uint32 zone_version, Client *client, NPC* spawn, uint32 extra);
     uint32  AddNewNPCSpawnGroupCommand(const char* zone, uint32 zone_version, Client *client, NPC* spawn, uint32 respawnTime);
     uint32  DeleteSpawnLeaveInNPCTypeTable(const char* zone, Client *client, NPC* spawn);
+    uint32  DeleteSpawnRemoveFromNPCTypeTable(const char* zone, uint32 zone_version, Client *client, NPC* spawn);
     uint32  UpdateNPCTypeAppearance(Client *client, NPC* spawn);
 	bool	SetSpecialAttkFlag(uint8 id, const char* flag);
 	bool	GetPetEntry(const char *pet_type, PetRecord *into);