diff --git a/api/src/main/java/com/alttd/chat/config/Config.java b/api/src/main/java/com/alttd/chat/config/Config.java
index 0a19aa5..112fe17 100755
--- a/api/src/main/java/com/alttd/chat/config/Config.java
+++ b/api/src/main/java/com/alttd/chat/config/Config.java
@@ -381,8 +381,8 @@ public final class Config {
         }
 
         CUSTOM_CHANNEL_TOGGLED = getString("chat-channels-messages.channel-toggled", CUSTOM_CHANNEL_TOGGLED);
-        TOGGLED_ON = Utility.parseMiniMessage(getString("party.messages.online-prefix", "<green>on</green><gray>"));
-        TOGGLED_OFF = Utility.parseMiniMessage(getString("party.messages.offline-prefix", "<red>off</red><gray>"));
+        TOGGLED_ON = Utility.parseMiniMessage(getString("chat-channels-messages.channel-on", "<green>on</green><gray>"));
+        TOGGLED_OFF = Utility.parseMiniMessage(getString("chat-channels-messages.channel-off", "<red>off</red><gray>"));
     }
 
     public static String SERVERMUTEPERMISSION = "chat.command.mute-server";
diff --git a/galaxy/src/main/java/com/alttd/chat/commands/ChatChannel.java b/galaxy/src/main/java/com/alttd/chat/commands/ChatChannel.java
index 94dfdef..6370c00 100644
--- a/galaxy/src/main/java/com/alttd/chat/commands/ChatChannel.java
+++ b/galaxy/src/main/java/com/alttd/chat/commands/ChatChannel.java
@@ -37,8 +37,8 @@ public class ChatChannel extends BukkitCommand {
             return true;
         }
 
-        if(args.length == 0) {
-            player.sendMiniMessage(Config.PARTY_TOGGLED, TagResolver.resolver(
+        if(args.length == 0 && player.hasPermission(channel.getPermission())) {
+            player.sendMiniMessage(Config.CUSTOM_CHANNEL_TOGGLED, TagResolver.resolver(
                     Placeholder.unparsed("channel", channel.getChannelName()),
                     Placeholder.component("status", toggleableForCustomChannel.toggle(player.getUniqueId())
                             ? Config.TOGGLED_ON : Config.TOGGLED_OFF)));
diff --git a/galaxy/src/main/java/com/alttd/chat/commands/PartyChat.java b/galaxy/src/main/java/com/alttd/chat/commands/PartyChat.java
index 51a847b..0cc2012 100644
--- a/galaxy/src/main/java/com/alttd/chat/commands/PartyChat.java
+++ b/galaxy/src/main/java/com/alttd/chat/commands/PartyChat.java
@@ -50,7 +50,7 @@ public class PartyChat extends Toggleable implements CommandExecutor {
 
     @Override
     public void setOff(UUID uuid) {
-        disableToggles(uuid);
+        toggledUsers.remove(uuid);
     }
 
     @Override
diff --git a/galaxy/src/main/java/com/alttd/chat/util/ToggleableForCustomChannel.java b/galaxy/src/main/java/com/alttd/chat/util/ToggleableForCustomChannel.java
index b9d7871..405bfc7 100644
--- a/galaxy/src/main/java/com/alttd/chat/util/ToggleableForCustomChannel.java
+++ b/galaxy/src/main/java/com/alttd/chat/util/ToggleableForCustomChannel.java
@@ -27,7 +27,7 @@ public class ToggleableForCustomChannel extends Toggleable {
 
     @Override
     public void setOff(UUID uuid) {
-        disableToggles(uuid);
+        toggledUsers.remove(uuid);
     }
 
     @Override