diff --git a/src/plugins/simulator/fs9/fs9_client.cpp b/src/plugins/simulator/fs9/fs9_client.cpp
index c0e223699..811977a6c 100644
--- a/src/plugins/simulator/fs9/fs9_client.cpp
+++ b/src/plugins/simulator/fs9/fs9_client.cpp
@@ -94,12 +94,6 @@ namespace BlackSimPlugin
 
             QMutexLocker locker(&m_mutexInterpolator);
 
-            if (m_interpolator.getTimeOfLastReceivedSituation().secsTo(QDateTime::currentDateTimeUtc()) > 15)
-            {
-                emit clientTimedOut(m_callsign);
-                return;
-            }
-
             if (m_interpolator.hasEnoughAircraftSituations())
             {
                 CAircraftSituation situation = m_interpolator.getCurrentSituation();
diff --git a/src/plugins/simulator/fs9/fs9_client.h b/src/plugins/simulator/fs9/fs9_client.h
index 7e0749a2f..1a77a2491 100644
--- a/src/plugins/simulator/fs9/fs9_client.h
+++ b/src/plugins/simulator/fs9/fs9_client.h
@@ -65,9 +65,6 @@ namespace BlackSimPlugin
 
         signals:
 
-            //! Client timed out
-            void clientTimedOut(const QString &callsign);
-
             //! Client status changed
             void statusChanged(const QString &callsign, BlackSimPlugin::Fs9::CFs9Client::ClientStatus);
 
diff --git a/src/plugins/simulator/fs9/simulator_fs9.cpp b/src/plugins/simulator/fs9/simulator_fs9.cpp
index d7b9510da..4ccc6686f 100644
--- a/src/plugins/simulator/fs9/simulator_fs9.cpp
+++ b/src/plugins/simulator/fs9/simulator_fs9.cpp
@@ -126,7 +126,6 @@ namespace BlackSimPlugin
             client->moveToThread(clientThread);
 
             connect(clientThread, &QThread::started, client, &CFs9Client::init);
-            connect(client, &CFs9Client::clientTimedOut, this, &CSimulatorFs9::ps_removeAircraft);
             connect(client, &CFs9Client::statusChanged, this, &CSimulatorFs9::ps_changeClientStatus);
             m_fs9ClientThreads.insert(client, clientThread);
             m_hashFs9Clients.insert(callsign, client);
@@ -155,7 +154,12 @@ namespace BlackSimPlugin
 
         void CSimulatorFs9::removeRemoteAircraft(const CCallsign &callsign)
         {
-            ps_removeAircraft(callsign.toQString());
+            if(!m_hashFs9Clients.contains(callsign)) return;
+
+            CFs9Client *fs9Client = m_hashFs9Clients.value(callsign);
+
+            // Send an async disconnect signal. When finished we will clean up
+            QMetaObject::invokeMethod(fs9Client, "disconnectFrom");
         }
 
         bool CSimulatorFs9::updateOwnSimulatorCockpit(const CAircraft &ownAircraft)
@@ -342,16 +346,6 @@ namespace BlackSimPlugin
             }
         }
 
-        void CSimulatorFs9::ps_removeAircraft(const QString &callsign)
-        {
-            if(!m_hashFs9Clients.contains(callsign)) return;
-
-            CFs9Client *fs9Client = m_hashFs9Clients.value(callsign);
-
-            // Send an async disconnect signal. When finished we will clean up
-            QMetaObject::invokeMethod(fs9Client, "disconnectFrom");
-        }
-
         void CSimulatorFs9::updateOwnAircraftFromSim(const CAircraft &ownAircraft)
         {
             m_ownAircraft.setCom1System(ownAircraft.getCom1System());
diff --git a/src/plugins/simulator/fs9/simulator_fs9.h b/src/plugins/simulator/fs9/simulator_fs9.h
index 94a059e8d..f4f325e98 100644
--- a/src/plugins/simulator/fs9/simulator_fs9.h
+++ b/src/plugins/simulator/fs9/simulator_fs9.h
@@ -140,9 +140,6 @@ namespace BlackSimPlugin
 
             void ps_changeClientStatus(const QString &callsign, BlackSimPlugin::Fs9::CFs9Client::ClientStatus status);
 
-            //! Remove client by callsign QString
-            void ps_removeAircraft(const QString &callsign);
-
         private:
 
             //! Called when data about our own aircraft are received
diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulator_fsx.cpp
index a1b2799cb..67a92e189 100644
--- a/src/plugins/simulator/fsx/simulator_fsx.cpp
+++ b/src/plugins/simulator/fsx/simulator_fsx.cpp
@@ -482,12 +482,6 @@ namespace BlackSimPlugin
         {
             foreach(CSimConnectObject simObj, m_simConnectObjects)
             {
-                if (simObj.getInterpolator()->getTimeOfLastReceivedSituation().secsTo(QDateTime::currentDateTimeUtc()) > 15)
-                {
-                    removeRemoteAircraft(simObj);
-                    continue;
-                }
-
                 if (simObj.getInterpolator()->hasEnoughAircraftSituations())
                 {
                     SIMCONNECT_DATA_INITPOSITION position;