diff --git a/common/city.cpp b/common/city.cpp
index 1f4c20aec1..2e1237f6fc 100644
--- a/common/city.cpp
+++ b/common/city.cpp
@@ -1834,6 +1834,8 @@ int city_change_production_penalty(const struct city *pcity,
             && target->value.utype != pcity->changed_from.value.utype)))) {
     unpenalized_shields -= pcity->bought_shields;
     penalized_shields += pcity->bought_shields;
+  } else {
+    unpenalized_shields += pcity->bought_shields;
   }
 
   /* Do not put penalty on these. It shouldn't matter whether you disband