diff --git a/packages/ddp-client/common/livedata_connection.js b/packages/ddp-client/common/livedata_connection.js
index 868201c43d3..36527208834 100644
--- a/packages/ddp-client/common/livedata_connection.js
+++ b/packages/ddp-client/common/livedata_connection.js
@@ -1776,8 +1776,7 @@ export class Connection {
     }
 
     if (msg === null || !msg.msg) {
-      if(!msg || !msg.testMessageOnConnect) {
-        if (Object.keys(msg).length === 1 && msg.server_id) return;
+      if (msg && (!msg.testMessageOnConnect && !(Object.keys(msg).length === 1 && msg.server_id))) {
         Meteor._debug('discarding invalid livedata message', msg);
       }
       return;