diff --git a/source/WorldServer/zoneserver.cpp b/source/WorldServer/zoneserver.cpp
index c76b274..49757d9 100644
--- a/source/WorldServer/zoneserver.cpp
+++ b/source/WorldServer/zoneserver.cpp
@@ -215,6 +215,9 @@ ZoneServer::~ZoneServer() {
 		Sleep(10);
 	}
 	
+	if(spellProcess)
+		spellProcess->RemoveAllSpells(true);
+	
 	MChangedSpawns.lock();
 	changed_spawns.clear();
 	MChangedSpawns.unlock();