diff --git a/common/src/main/java/me/lucko/luckperms/common/plugin/AbstractLuckPermsPlugin.java b/common/src/main/java/me/lucko/luckperms/common/plugin/AbstractLuckPermsPlugin.java
index 9473c2d5..66d51718 100644
--- a/common/src/main/java/me/lucko/luckperms/common/plugin/AbstractLuckPermsPlugin.java
+++ b/common/src/main/java/me/lucko/luckperms/common/plugin/AbstractLuckPermsPlugin.java
@@ -195,6 +195,12 @@ public abstract class AbstractLuckPermsPlugin implements LuckPermsPlugin {
         // remove any hooks into the platform
         removePlatformHooks();
 
+        // close messaging service
+        if (this.messagingService != null) {
+            getLogger().info("Closing messaging service...");
+            this.messagingService.close();
+        }
+
         // close storage
         getLogger().info("Closing storage...");
         this.storage.shutdown();
@@ -204,12 +210,6 @@ public abstract class AbstractLuckPermsPlugin implements LuckPermsPlugin {
             this.fileWatcher.close();
         }
 
-        // close messaging service
-        if (this.messagingService != null) {
-            getLogger().info("Closing messaging service...");
-            this.messagingService.close();
-        }
-
         // unregister api
         ApiRegistrationUtil.unregisterProvider();