diff --git a/plugins/Services/plugin.py b/plugins/Services/plugin.py
index 4f1d462e9..053134265 100644
--- a/plugins/Services/plugin.py
+++ b/plugins/Services/plugin.py
@@ -264,8 +264,10 @@ class Services(callbacks.Plugin):
                              on)
         elif 'inviting' in s:
             self.log.debug('Got "Inviting to channel" from ChanServ %s.', on)
-        elif s.startswith('[#'):
-            self.log.debug('Got entrymsg from ChanServ %s.', on)
+        elif s.startswith('['):
+            chanTypes = irc.state.supported['CHANTYPES']
+            if re.match(r'^\[[%s]' % re.escape(chanTypes), s):
+                self.log.debug('Got entrymsg from ChanServ %s.', on)
         else:
             self.log.warning('Got unexpected notice from ChanServ %s: %r.',
                              on, msg)