diff --git a/server/channelserver/handlers_cast_binary.go b/server/channelserver/handlers_cast_binary.go
index 4d3fc639a..71a8a6f07 100644
--- a/server/channelserver/handlers_cast_binary.go
+++ b/server/channelserver/handlers_cast_binary.go
@@ -325,7 +325,9 @@ func parseChatCommand(s *Session, command string) {
 	case commands["Help"].Prefix:
 		if commands["Help"].Enabled {
 			for _, command := range commands {
-				sendServerChatMessage(s, fmt.Sprintf("%s%s: %s", s.server.erupeConfig.CommandPrefix, command.Prefix, command.Description))
+				if command.Enabled {
+					sendServerChatMessage(s, fmt.Sprintf("%s%s: %s", s.server.erupeConfig.CommandPrefix, command.Prefix, command.Description))
+				}
 			}
 		} else {
 			sendDisabledCommandMessage(s, commands["Help"])