diff --git a/src/PlayerManager.cpp b/src/PlayerManager.cpp
index 3cbb2dd..db51186 100644
--- a/src/PlayerManager.cpp
+++ b/src/PlayerManager.cpp
@@ -88,6 +88,16 @@ void PlayerManager::removePlayer(CNSocket* key) {
     // if the player was in a lair, clean it up
     ChunkManager::destroyInstanceIfEmpty(fromInstance);
 
+    // remove player's buffs from the server
+    auto it = NPCManager::EggBuffs.begin();
+    while (it != NPCManager::EggBuffs.end()) {
+        if (it->first.first == key) {
+            it = NPCManager::EggBuffs.erase(it);
+        }
+        else
+            it++;
+    }
+
     std::cout << players.size() << " players" << std::endl;
 }