diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 61f42931a..fbe874f16 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -329,6 +329,8 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 		Economy.setEss(null);
 		Trade.closeLog();
 		getUserMap().getUUIDMap().forceWriteUUIDMap();
+		
+		HandlerList.unregisterAll(this);
 	}
 
 	@Override