diff --git a/src/blackcore/fsd/fsdclient.cpp b/src/blackcore/fsd/fsdclient.cpp
index 235dbe956..4a2dddc4d 100644
--- a/src/blackcore/fsd/fsdclient.cpp
+++ b/src/blackcore/fsd/fsdclient.cpp
@@ -874,8 +874,7 @@ namespace BlackCore
 
                 CTextMessage tm(textMessage.m_message, sender, receiver);
                 tm.setCurrentUtcTime();
-                this->consolidateTextMessage(tm);
-                // emit textMessagesReceived({ tm });
+                this->consolidateTextMessage(tm); // emit textMessagesReceived({ tm });
             }
             else if (textMessage.m_type == TextMessage::RadioMessage)
             {
@@ -1529,8 +1528,7 @@ namespace BlackCore
                 const QString atisMessage(pendingQuery.m_atisMessage.join(QChar::LineFeed));
                 CTextMessage tm(atisMessage, sender, receiver);
                 tm.setCurrentUtcTime();
-                // emit textMessagesReceived(tm);
-                this->consolidateTextMessage(tm);
+                this->consolidateTextMessage(tm); // emit textMessagesReceived(tm);
                 m_pendingAtisQueries.remove(sender);
                 return;
             }
diff --git a/src/blackcore/fsd/fsdclient.h b/src/blackcore/fsd/fsdclient.h
index b02a1066c..77a329735 100644
--- a/src/blackcore/fsd/fsdclient.h
+++ b/src/blackcore/fsd/fsdclient.h
@@ -351,8 +351,8 @@ namespace BlackCore
             QString m_hostApplication;
             int m_versionMajor = 0;
             int m_versionMinor = 0;
-            ServerType m_serverType = ServerType::LegacyFsd;
             int m_protocolRevision = 0;
+            ServerType m_serverType = ServerType::LegacyFsd;
             Capabilities m_capabilities = Capabilities::None;
 
             vatsim_auth *clientAuth = nullptr;
@@ -360,29 +360,27 @@ namespace BlackCore
             QString m_lastServerAuthChallenge;
 
             // User data
-            BlackMisc::Network::CServer m_server;
+            BlackMisc::Network::CServer    m_server;
             BlackMisc::Network::CLoginMode m_loginMode;
-            SimType m_simType = SimType::Unknown;
+            SimType     m_simType     = SimType::Unknown;
             PilotRating m_pilotRating = PilotRating::Unknown;
-            AtcRating m_atcRating = AtcRating::Unknown;
-            QString m_com1Frequency;
+            AtcRating   m_atcRating   = AtcRating::Unknown;
+            QString     m_com1Frequency;
 
             // Parser
             QHash<QString, MessageType> m_messageTypeMapping;
 
             QTcpSocket m_socket;
 
-            bool m_unitTestMode = false;
+            bool m_unitTestMode   = false;
             bool m_printToConsole = false;
 
             BlackMisc::Network::CConnectionStatus m_connectionStatus;
-
-            BlackMisc::Aviation::CAircraftParts m_sentAircraftConfig;        //!< aircraft parts sent
-            BlackMisc::CTokenBucket             m_tokenBucket;               //!< used with aircraft parts messages
-            BlackMisc::Aviation::CCallsignSet   m_interimPositionReceivers;  //!< all aircraft receiving interim positions
-
-            BlackMisc::CDigestSignal m_dsSendTextMessage  { this, &CFSDClient::emitConsolidatedTextMessages, 500, 10 };
-            BlackMisc::Network::CTextMessageList m_textMessagesToConsolidate;
+            BlackMisc::Aviation::CAircraftParts   m_sentAircraftConfig;        //!< aircraft parts sent
+            BlackMisc::CTokenBucket               m_tokenBucket;               //!< used with aircraft parts messages
+            BlackMisc::Aviation::CCallsignSet     m_interimPositionReceivers;  //!< all aircraft receiving interim positions
+            BlackMisc::Network::CTextMessageList  m_textMessagesToConsolidate; //!< waiting for new messages
+            BlackMisc::CDigestSignal m_dsSendTextMessage  { this, &CFSDClient::emitConsolidatedTextMessages, 250, 10 };
 
             //! ATIS message
             struct AtisMessage
diff --git a/tests/blackcore/fsd/testfsdclient/testfsdclient.cpp b/tests/blackcore/fsd/testfsdclient/testfsdclient.cpp
index 554f52253..d67b0fb2d 100644
--- a/tests/blackcore/fsd/testfsdclient/testfsdclient.cpp
+++ b/tests/blackcore/fsd/testfsdclient/testfsdclient.cpp
@@ -183,6 +183,7 @@ namespace BlackFsdTest
     {
         QSignalSpy spy(client, &CFSDClient::textMessagesReceived);
         client->sendFsdMessage("#TMEDMM_CTR:BER721:Hey how are you doing?\r\n");
+        spy.wait(2000); // message consolidation
 
         QCOMPARE(spy.count(), 1);
         QList<QVariant> arguments = spy.takeFirst();