diff --git a/spigot/src/main/java/com/glyart/authmevelocity/spigot/AuthMeVelocityPlugin.java b/spigot/src/main/java/com/glyart/authmevelocity/spigot/AuthMeVelocityPlugin.java
index 0149212..2689f6a 100644
--- a/spigot/src/main/java/com/glyart/authmevelocity/spigot/AuthMeVelocityPlugin.java
+++ b/spigot/src/main/java/com/glyart/authmevelocity/spigot/AuthMeVelocityPlugin.java
@@ -12,19 +12,28 @@ import org.jetbrains.annotations.NotNull;
 
 public class AuthMeVelocityPlugin extends JavaPlugin {
     private static final String CHANNEL = "authmevelocity:main";
+
     @Override
     public void onEnable() {
         this.getServer().getMessenger().registerOutgoingPluginChannel(this, CHANNEL);
         this.getServer().getMessenger().registerIncomingPluginChannel(this, CHANNEL, new MessageListener());
         this.getServer().getPluginManager().registerEvents(new AuthMeListener(this), this);
 
-        if(this.getServer().getPluginManager().isPluginEnabled("MiniPlaceholders")){
+        if (this.getServer().getPluginManager().isPluginEnabled("MiniPlaceholders")) {
             AuthmePlaceholders.getExpansion().register();
         }
 
         this.getSLF4JLogger().info("AuthMeVelocity enabled");
     }
 
+    @Override
+    public void onDisable() {
+        this.getServer().getMessenger().unregisterOutgoingPluginChannel(this, CHANNEL);
+        this.getServer().getMessenger().unregisterIncomingPluginChannel(this, CHANNEL);
+
+        this.getSLF4JLogger().info("AuthmeVelocity disabled");
+    }
+
     public void sendMessageToProxy(final Player player, @NotNull MessageType type, @NotNull String playername) {
         ByteArrayDataOutput out = ByteStreams.newDataOutput();
         out.writeUTF(type.toString());