diff --git a/modules/block_motd.cpp b/modules/block_motd.cpp
index 881fde5b..483ab687 100644
--- a/modules/block_motd.cpp
+++ b/modules/block_motd.cpp
@@ -62,6 +62,12 @@ class CBlockMotd : public CModule {
             }
             StopTemporarilyAcceptingMotd();
         }
+
+        if (sCmd == "422") {
+            // Server has no MOTD
+            StopTemporarilyAcceptingMotd();
+        }
+
         return CONTINUE;
     }