diff --git a/core/src/com/unciv/ui/tilegroups/CityTileGroup.kt b/core/src/com/unciv/ui/tilegroups/CityTileGroup.kt
index cb1919558c..9bdd967276 100644
--- a/core/src/com/unciv/ui/tilegroups/CityTileGroup.kt
+++ b/core/src/com/unciv/ui/tilegroups/CityTileGroup.kt
@@ -16,7 +16,7 @@ import com.unciv.ui.utils.extensions.setFontColor
 import com.unciv.ui.utils.extensions.toGroup
 import com.unciv.ui.utils.extensions.toLabel
 
-class CityTileGroup(private val city: City, tile: Tile, tileSetStrings: TileSetStrings) : TileGroup(tile,tileSetStrings) {
+class CityTileGroup(val city: City, tile: Tile, tileSetStrings: TileSetStrings) : TileGroup(tile,tileSetStrings) {
 
     var isWorkable = false
     var isPurchasable = false
diff --git a/core/src/com/unciv/ui/tilegroups/layers/TileLayerMisc.kt b/core/src/com/unciv/ui/tilegroups/layers/TileLayerMisc.kt
index def3e45230..9a7a6dd3ca 100644
--- a/core/src/com/unciv/ui/tilegroups/layers/TileLayerMisc.kt
+++ b/core/src/com/unciv/ui/tilegroups/layers/TileLayerMisc.kt
@@ -14,6 +14,7 @@ import com.unciv.models.helpers.MiscArrowTypes
 import com.unciv.models.helpers.TintedMapArrow
 import com.unciv.models.helpers.UnitMovementMemoryType
 import com.unciv.ui.images.ImageGetter
+import com.unciv.ui.tilegroups.CityTileGroup
 import com.unciv.ui.tilegroups.TileGroup
 import com.unciv.ui.tilegroups.TileSetStrings
 import com.unciv.ui.tilegroups.WorldTileGroup
@@ -226,7 +227,10 @@ class TileLayerMisc(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup, si
 
         if (showTileYields) {
             // Setting up YieldGroup Icon
-            yields.setStats(tile().stats.getTileStats(viewingCiv))
+            if (tileGroup is CityTileGroup)
+                yields.setStats(tile().stats.getTileStats(tileGroup.city, viewingCiv))
+            else
+                yields.setStats(tile().stats.getTileStats(viewingCiv))
             yields.setOrigin(Align.center)
             yields.setScale(0.7f)
             yields.toFront()
@@ -269,6 +273,7 @@ class TileLayerMisc(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup, si
 
     fun setYieldVisible(isVisible: Boolean) {
         yields.isVisible = isVisible
+        determineVisibility()
     }
 
     override fun doUpdate(viewingCiv: Civilization?) {