diff --git a/src/plugins/simulator/fs9/simulator_fs9.cpp b/src/plugins/simulator/fs9/simulator_fs9.cpp
index 4ccc6686f..65fbdc15f 100644
--- a/src/plugins/simulator/fs9/simulator_fs9.cpp
+++ b/src/plugins/simulator/fs9/simulator_fs9.cpp
@@ -136,14 +136,7 @@ namespace BlackSimPlugin
 
         void CSimulatorFs9::addAircraftSituation(const CCallsign &callsign, const CAircraftSituation &situation)
         {
-            // FIXME: should be a Q_ASSERT
-            if (!m_hashFs9Clients.contains(callsign))
-            {
-                // Only add a maximum number of 20 clients.
-                // FIXME: We need a smart method to get the 20 nearest aircrafts. If someone logs in
-                // nearby we need to kick out the one with max distance.
-                return;
-            }
+            Q_ASSERT(m_hashFs9Clients.contains(callsign));
 
             CFs9Client *client = m_hashFs9Clients.value(callsign);
             if (!client)
diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulator_fsx.cpp
index 67a92e189..dc44abec3 100644
--- a/src/plugins/simulator/fsx/simulator_fsx.cpp
+++ b/src/plugins/simulator/fsx/simulator_fsx.cpp
@@ -173,11 +173,8 @@ namespace BlackSimPlugin
 
         void CSimulatorFsx::addAircraftSituation(const CCallsign &callsign, const CAircraftSituation &initialSituation)
         {
-            if (!m_simConnectObjects.contains(callsign)) {
-                // according to #324 this should not happen
-                Q_ASSERT(false);
-                this->addRemoteAircraft(callsign, initialSituation);
-            }
+            Q_ASSERT(m_simConnectObjects.contains(callsign));
+
             CSimConnectObject simObj = m_simConnectObjects.value(callsign);
             simObj.getInterpolator()->addAircraftSituation(initialSituation);
             m_simConnectObjects.insert(callsign, simObj);