diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
index 89be61427..d6315767f 100644
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -176,10 +176,12 @@ public class mcMMO extends JavaPlugin {
         catch (NullPointerException e) {}
 
         getServer().getScheduler().cancelTasks(this); // This removes our tasks
+
         if (Config.getInstance().getUseMySQL()) {
-            queueManager.disable();
-            queueManager = null;
+            queueManager.disable(); // Disable and stop queue thread
+            queueManager = null; // null static variable
         }
+
         HandlerList.unregisterAll(this); // Cancel event registrations
 
         if (Config.getInstance().getBackupsEnabled()) {