diff --git a/bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java b/bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java
index 40c0d999..8c44f263 100644
--- a/bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java
+++ b/bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java
@@ -194,12 +194,12 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
         this.disabling = true;
 
         // Close the event listener / data syncer
-        if (this.eventListener != null) {
-            this.eventListener.handlePluginDisable();
-        }
         if (this.dataSyncer != null) {
             this.dataSyncer.terminate();
         }
+        if (this.eventListener != null) {
+            this.eventListener.handlePluginDisable();
+        }
 
         // Unregister API and cancel tasks
         BukkitHuskSyncAPI.unregister();