2 files changed, 3 insertions, 4 deletions
diff --git a/modules/line_handler/core.py b/modules/line_handler/core.py
index 81c364ce..aac9e327 100644
--- a/modules/line_handler/core.py
+++ b/modules/line_handler/core.py
@@ -77,7 +77,7 @@ def _own_modes(server, modes):
 def mode(events, event):
     user = event["server"].get_user(event["line"].source.nickname)
     target = event["line"].args[0]
-    is_channel = target[0] in event["server"].channel_types
+    is_channel = event["server"].is_channel(target)
     if is_channel:
         channel = event["server"].channels.get(target)
         modes = event["line"].args[1]
diff --git a/modules/line_handler/message.py b/modules/line_handler/message.py
index d44ed81e..e644d08e 100644
--- a/modules/line_handler/message.py
+++ b/modules/line_handler/message.py
@@ -41,10 +41,9 @@ def message(events, event):
     # voiced-or-above users
     target = target_str.lstrip("".join(event["server"].statusmsg))
 
-    is_channel = False
+    is_channel = event["server"].is_channel(target)
 
-    if target[0] in event["server"].channel_types:
-        is_channel = True
+    if is_channel:
         if not target in event["server"].channels:
             return
         target_obj = event["server"].channels.get(target)