diff --git a/src/irclib.py b/src/irclib.py
index ae15a8d47..70715ec98 100644
--- a/src/irclib.py
+++ b/src/irclib.py
@@ -1809,9 +1809,13 @@ class Irc(IrcCommandDispatcher, log.Firewalled):
 
         `msg` is the message that triggered this call."""
         self.state.fsm.expect_state([
-            # Normal CAP ACK / CAP NAK during cap negotiation
+            # Normal CAP ACK / CAP NAK during cap negotiation:
             IrcStateFsm.States.INIT_CAP_NEGOTIATION,
-            # CAP ACK / CAP NAK after a CAP NEW (probably)
+            # Sigyn sends CAP REQ when it sees RPL_SASLSUCCESS, so we get the
+            # CAP ACK while waiting for MOTD on some IRCds (eg. InspIRCd):
+            IrcStateFsm.States.INIT_WAITING_MOTD,
+            IrcStateFsm.States.INIT_MOTD,
+            # CAP ACK / CAP NAK after a CAP NEW (probably):
             IrcStateFsm.States.CONNECTED,
         ])