diff --git a/core/src/com/unciv/ui/pickerscreens/ConstructionPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/ConstructionPickerScreen.kt
index adde0e6315..8ebfa98da5 100644
--- a/core/src/com/unciv/ui/pickerscreens/ConstructionPickerScreen.kt
+++ b/core/src/com/unciv/ui/pickerscreens/ConstructionPickerScreen.kt
@@ -57,7 +57,7 @@ class ConstructionPickerScreen(val city: CityInfo) : PickerScreen() {
                 regularBuildings.addActor(productionTextButton)
         }
 
-        for (unit in GameBasics.Units.values.filterNot { it.unbuildable }) {
+        for (unit in GameBasics.Units.values.filter { it.isBuildable(cityConstructions)}) {
             units.addActor(getProductionButton(unit.name,
                     unit.name + "\r\n" + cityConstructions.turnsToConstruction(unit.name) + " turns",
                     unit.baseDescription, "Train " + unit.name))