diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
index abb70cea67..83b61d978a 100644
--- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
+++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
@@ -59,7 +59,12 @@ class UnitActions {
         }
 
         if(unit.getBaseUnit().upgradesTo!=null && tile.getOwner()==unit.civInfo) {
-            val upgradedUnit = GameBasics.Units[unit.getBaseUnit().upgradesTo!!]!!
+            var upgradedUnit = GameBasics.Units[unit.getBaseUnit().upgradesTo!!]!!
+
+            // Go up the upgrade tree until you find the first one which isn't obsolete
+            while (upgradedUnit.obsoleteTech!=null && unit.civInfo.tech.isResearched(upgradedUnit.obsoleteTech!!))
+                upgradedUnit = GameBasics.Units[upgradedUnit.upgradesTo!!]!!
+
             if (upgradedUnit.isBuildable(unit.civInfo)) {
                 val goldCostOfUpgrade = (upgradedUnit.cost - unit.getBaseUnit().cost) * 2 + 10
                 actionList += UnitAction("Upgrade to [${upgradedUnit.name}] ([$goldCostOfUpgrade] gold)",