diff --git a/src/blackmisc/aviation/aircrafticaocodelist.cpp b/src/blackmisc/aviation/aircrafticaocodelist.cpp
index 8a04afee1..725b44695 100644
--- a/src/blackmisc/aviation/aircrafticaocodelist.cpp
+++ b/src/blackmisc/aviation/aircrafticaocodelist.cpp
@@ -167,6 +167,11 @@ namespace BlackMisc
             this->sortBy(&CAircraftIcaoCode::getDesignator, &CAircraftIcaoCode::getManufacturer, &CAircraftIcaoCode::getRank);
         }
 
+        void CAircraftIcaoCodeList::removeInvalidCombinedCodes()
+        {
+            this->removeIf([](const CAircraftIcaoCode & icao) { return !icao.hasValidCombinedType(); });
+        }
+
         QStringList CAircraftIcaoCodeList::toCompleterStrings(bool withIataCodes, bool withFamily, bool sort) const
         {
             QStringList c;
diff --git a/src/blackmisc/aviation/aircrafticaocodelist.h b/src/blackmisc/aviation/aircrafticaocodelist.h
index 6684a0e02..50a12159a 100644
--- a/src/blackmisc/aviation/aircrafticaocodelist.h
+++ b/src/blackmisc/aviation/aircrafticaocodelist.h
@@ -100,6 +100,9 @@ namespace BlackMisc
             //! Sort by designator first, then by manufacturer and rank
             void sortByDesignatorManufacturerAndRank();
 
+            //! Remove invalid combined codes
+            void removeInvalidCombinedCodes();
+
             //! For selection completion
             QStringList toCompleterStrings(bool withIataCodes = false, bool withFamily = false, bool sort = true) const;