diff --git a/source/WorldServer/Entity.cpp b/source/WorldServer/Entity.cpp
index 417899b..5fb1418 100644
--- a/source/WorldServer/Entity.cpp
+++ b/source/WorldServer/Entity.cpp
@@ -135,7 +135,7 @@ void Entity::DeleteSpellEffects(bool removeClient)
 			if(deletedPtrs.find(GetInfoStruct()->spell_effects[i].spell) == deletedPtrs.end()) {
 				if(GetInfoStruct()->spell_effects[i].spell && GetInfoStruct()->spell_effects[i].spell->spell && 
 					GetInfoStruct()->spell_effects[i].spell->spell->GetSpellData()->spell_book_type == SPELL_BOOK_TYPE_NOT_SHOWN) {
-					deletedPtrs[GetInfoStruct()->spell_effects[i].spell] = true;
+					deletedPtrs[GetInfoStruct()->spell_effects[i].spell] = false;
 				}
 			}
 			GetInfoStruct()->spell_effects[i].spell_id = 0xFFFFFFFF;
@@ -147,7 +147,10 @@ void Entity::DeleteSpellEffects(bool removeClient)
 	
 	map<LuaSpell*,bool>::iterator deletedPtrItrs;
 	for(deletedPtrItrs = deletedPtrs.begin(); deletedPtrItrs != deletedPtrs.end(); deletedPtrItrs++) {
-		lua_interface->RemoveSpell(deletedPtrItrs->first, false, removeClient, "", removeClient);
+		if(itr->second)
+			lua_interface->RemoveSpell(deletedPtrItrs->first, false, removeClient, "", removeClient, false, this);
+		else
+			lua_interface->RemoveSpell(deletedPtrItrs->first, false, removeClient, "", removeClient, true, this);
 	}
 }