diff --git a/lib/transport.js b/lib/transport.js
index 56cee8b..b0aecd9 100644
--- a/lib/transport.js
+++ b/lib/transport.js
@@ -55,6 +55,15 @@ bot.on('chat', (partner, msg) => {
 
     const xid = uniqid();
 
+    if (!isReady) {
+        if (!customPing.isPingMessage(msg) && !customPing.isPongMessage(msg)) {
+            logger.warn('Warming up is not finished yet, ignoring message', {
+                xid, me: config.username, partner, msg,
+            });
+        }
+        return;
+    }
+
     if (customPing.isPongMessage(msg)) {
         if (config.custom_ping && config.custom_ping.verbose) {
             logger.verbose(`${MODULE_NAME} 70CDD087: Got PONG message`, {
@@ -79,14 +88,6 @@ bot.on('chat', (partner, msg) => {
         return;
     }
 
-    if (!isReady) {
-        logger.warn('Warming up is not finished yet, ignoring message', {
-            xid, me: config.username, partner, msg,
-        });
-
-        return;
-    }
-
     logger.info('Incoming message via XMPP transport', {
         xid, me: config.username, partner, msg,
     });