diff --git a/src/blackcore/fsd/fsdclient.cpp b/src/blackcore/fsd/fsdclient.cpp
index 85a08108d..8d392628d 100644
--- a/src/blackcore/fsd/fsdclient.cpp
+++ b/src/blackcore/fsd/fsdclient.cpp
@@ -548,16 +548,15 @@ namespace BlackCore::Fsd
         QVector<int> frequencies;
         for (const auto &message : radioMessages)
         {
+            // Adjust to nearest frequency, in case of 5kHz difference
+            const CAtcStationList stations = m_atcStations.findIfFrequencyIsWithinSpacing(message.getFrequency(), CComSystem::ChannelSpacing25KHz);
+            const CFrequency freq = stations.isEmpty() ? message.getFrequency() : stations.findClosest(1, getOwnAircraftPosition()).front().getFrequency();
+
             // I could send the same message to n frequencies in one step
             // if this is really required, I need to group by message
             // currently I send individual messages
             frequencies.clear();
-            int freqkHz = message.getFrequency().valueInteger(CFrequencyUnit::kHz());
-            if (m_server.getServerType() == CServer::FSDServerVatsim)
-            {
-                // VATSIM always drops the last 5 kHz.
-                freqkHz = freqkHz / 10 * 10;
-            }
+            int freqkHz = freq.valueInteger(CFrequencyUnit::kHz());
             frequencies.push_back(freqkHz);
             sendRadioMessage(frequencies, message.getMessage());
             increaseStatisticsValue(QStringLiteral("sendTextMessages.FREQ"));
@@ -1016,6 +1015,8 @@ namespace BlackCore::Fsd
         const CCoordinateGeodetic position(atcDataUpdate.m_latitude, atcDataUpdate.m_longitude, 0);
 
         emit this->atcDataUpdateReceived(cs, freq, position, range);
+
+        m_atcStations.replaceOrAddObjectByCallsign({ cs, {}, freq, position, range });
     }
 
     void CFSDClient::handleAuthChallenge(const QStringList &tokens)
@@ -1048,6 +1049,8 @@ namespace BlackCore::Fsd
     {
         const DeleteAtc deleteAtc = DeleteAtc::fromTokens(tokens);
         emit deleteAtcReceived(deleteAtc.m_cid);
+
+        m_atcStations.removeByCallsign(deleteAtc.m_cid);
     }
 
     void CFSDClient::handleDeletePilot(const QStringList &tokens)
@@ -1728,6 +1731,7 @@ namespace BlackCore::Fsd
         m_pendingAtisQueries.clear();
         m_lastPositionUpdate.clear();
         m_lastOffsetTimes.clear();
+        m_atcStations.clear();
         m_queuedFsdMessages.clear();
         m_sentAircraftConfig = CAircraftParts::null();
         m_loginSince = -1;
diff --git a/src/blackcore/fsd/fsdclient.h b/src/blackcore/fsd/fsdclient.h
index 7a8c3757b..fe9ddd25d 100644
--- a/src/blackcore/fsd/fsdclient.h
+++ b/src/blackcore/fsd/fsdclient.h
@@ -19,6 +19,7 @@
 #include "blackmisc/simulation/ownaircraftprovider.h"
 #include "blackmisc/simulation/remoteaircraftprovider.h"
 #include "blackmisc/simulation/simulationenvironmentprovider.h"
+#include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/aviation/flightplan.h"
 #include "blackmisc/aviation/informationmessage.h"
@@ -497,6 +498,8 @@ namespace BlackCore::Fsd
         QHash<BlackMisc::Aviation::CCallsign, qint64> m_lastPositionUpdate;
         QHash<BlackMisc::Aviation::CCallsign, QList<qint64>> m_lastOffsetTimes; //!< latest offset first
 
+        BlackMisc::Aviation::CAtcStationList m_atcStations;
+
         BlackMisc::CSettingReadOnly<BlackCore::Vatsim::TRawFsdMessageSetting> m_fsdMessageSetting { this, &CFSDClient::fsdMessageSettingsChanged };
         QFile m_rawFsdMessageLogFile;
         std::atomic_bool m_rawFsdMessagesEnabled   { false };