diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/PandacraftUtils.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/PandacraftUtils.java
index efa511c..c050b5e 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/PandacraftUtils.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/PandacraftUtils.java
@@ -30,6 +30,7 @@ import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayerManager
 import net.mc_pandacraft.java.plugin.pandacraftutils.players.PlayerDataCleaner;
 import net.mc_pandacraft.java.util.mysql.DBConnection;
 
+import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class PandacraftUtils extends JavaPlugin {
@@ -156,6 +157,10 @@ public class PandacraftUtils extends JavaPlugin {
 		
 		setServerState(ServerState.STOPPING);
 		
+		HandlerList.unregisterAll(this);
+		
+		getServer().getScheduler().cancelTasks(this);
+		
 		ConfigManager.getInstance().saveAll();
         
         afkManager = null;