diff --git a/src/blackcore/airspace_monitor.cpp b/src/blackcore/airspace_monitor.cpp
index 2a795c363..7f0267c54 100644
--- a/src/blackcore/airspace_monitor.cpp
+++ b/src/blackcore/airspace_monitor.cpp
@@ -755,8 +755,8 @@ namespace BlackCore
         // store situation history
         CAircraftSituation situationWithCallsign(situation);
         situationWithCallsign.setCallsign(callsign);
-        this->m_aircraftSituations.insert(situationWithCallsign);
-        this->m_aircraftSituations.removeOlderThanNowMinusOffset(AircraftSituationsRemovedOffsetMs);
+        // this->m_aircraftSituations.insert_front(situationWithCallsign);
+        // this->m_aircraftSituations.removeOlderThanNowMinusOffset(AircraftSituationsRemovedOffsetMs);
 
         bool exists = this->m_aircraftInRange.containsCallsign(callsign);
         if (!exists)
@@ -881,7 +881,8 @@ namespace BlackCore
         parts.convertFromJson(config);
 
         // store part history
-        this->m_aircraftParts.insert(parts);
+        // this->m_aircraftParts.insert_front(parts);
+        // this->m_aircraftParts.removeOlderThanNowMinusOffset(AircraftPartsRemoveOffsetMs);
         emit this->addedRemoteAircraftParts(parts);
 
         CPropertyIndexVariantMap vm;
diff --git a/src/blackcore/airspace_monitor.h b/src/blackcore/airspace_monitor.h
index 1a4c6e6e0..e60ed3fb3 100644
--- a/src/blackcore/airspace_monitor.h
+++ b/src/blackcore/airspace_monitor.h
@@ -125,7 +125,8 @@ namespace BlackCore
             std::function<void(const BlackMisc::Aviation::CCallsign &)> removedAircraftSlot
         ) override;
 
-        const qint64 AircraftSituationsRemovedOffsetMs = 30 * 1000; //!< situations will be removed if older than
+        const qint64 AircraftSituationsRemovedOffsetMs = 30 * 1000; //!< situations older than now - offset will be removed
+        const qint64 AircraftPartsRemoveOffsetMs = 30* 1000;        //!< parts older than now - offset will be removed
 
     signals: