diff --git a/src/main/java/dev/plex/LibsDisguises.java b/src/main/java/dev/plex/LibsDisguises.java
index 1ec4c54..6970d9d 100644
--- a/src/main/java/dev/plex/LibsDisguises.java
+++ b/src/main/java/dev/plex/LibsDisguises.java
@@ -22,5 +22,6 @@ public class LibsDisguises extends PlexModule
     @Override
     public void disable()
     {
+        unregisterListener(new DisguiseListener());
     }
 }
diff --git a/src/main/java/dev/plex/command/DisguiseToggleCMD.java b/src/main/java/dev/plex/command/DisguiseToggleCMD.java
index 2d5289d..af10e75 100644
--- a/src/main/java/dev/plex/command/DisguiseToggleCMD.java
+++ b/src/main/java/dev/plex/command/DisguiseToggleCMD.java
@@ -25,6 +25,7 @@ public class DisguiseToggleCMD extends PlexCommand
         {
             Bukkit.getServer().getPluginManager().callEvent(new UndisguiseEvent(true));
         }
-        return Component.text(commandSender.getName() + " - " + (LibsDisguises.enabled ? "Enabling LibsDisguises" : "Disabling LibsDisguises")).color((LibsDisguises.enabled ? NamedTextColor.AQUA : NamedTextColor.RED));
+        Bukkit.broadcast(Component.text(commandSender.getName() + " - " + (LibsDisguises.enabled ? "Enabling LibsDisguises" : "Disabling LibsDisguises")).color((LibsDisguises.enabled ? NamedTextColor.AQUA : NamedTextColor.RED)));
+        return null;
     }
 }
diff --git a/src/main/java/dev/plex/command/UndisguiseAllCMD.java b/src/main/java/dev/plex/command/UndisguiseAllCMD.java
index 6a3bc0d..4ca1fbf 100644
--- a/src/main/java/dev/plex/command/UndisguiseAllCMD.java
+++ b/src/main/java/dev/plex/command/UndisguiseAllCMD.java
@@ -22,12 +22,14 @@ public class UndisguiseAllCMD extends PlexCommand
         if (args.length == 0)
         {
             Bukkit.getServer().getPluginManager().callEvent(new UndisguiseEvent(false));
-            return Component.text(sender.getName() + " - Undisguising all non-admins").color(NamedTextColor.RED);
+            Bukkit.broadcast(Component.text(sender.getName() + " - Undisguising all non-admins").color(NamedTextColor.RED));
+            return null;
         }
         else if (args[0].equalsIgnoreCase("-a"))
         {
             Bukkit.getServer().getPluginManager().callEvent(new UndisguiseEvent(true));
-            return Component.text(sender.getName() + " - Undisguising all players").color(NamedTextColor.RED);
+            Bukkit.broadcast(Component.text(sender.getName() + " - Undisguising all players").color(NamedTextColor.RED));
+            return null;
         }
         return usage();
     }