diff --git a/core/src/com/unciv/models/metadata/GameSettings.kt b/core/src/com/unciv/models/metadata/GameSettings.kt
index 923a195265..45337d7cba 100644
--- a/core/src/com/unciv/models/metadata/GameSettings.kt
+++ b/core/src/com/unciv/models/metadata/GameSettings.kt
@@ -9,7 +9,7 @@ data class WindowState (val width:Int=0, val height:Int=0)
 class GameSettings {
     var showWorkedTiles: Boolean = false
     var showResourcesAndImprovements: Boolean = true
-    var showTileYields: Boolean = true // JN
+    var showTileYields: Boolean = false
     var checkForDueUnits: Boolean = true
     var singleTapMove: Boolean = false
     var language: String = "English"
diff --git a/core/src/com/unciv/ui/tilegroups/TileGroupIcons.kt b/core/src/com/unciv/ui/tilegroups/TileGroupIcons.kt
index e5366410f8..db629b0bb2 100644
--- a/core/src/com/unciv/ui/tilegroups/TileGroupIcons.kt
+++ b/core/src/com/unciv/ui/tilegroups/TileGroupIcons.kt
@@ -11,7 +11,7 @@ import com.unciv.logic.map.MapUnit
 import com.unciv.ui.utils.*
 
 /** Helper class for TileGroup, which was getting too full */
-class TileGroupIcons(val tileGroup: TileGroup){
+class TileGroupIcons(val tileGroup: TileGroup) {
 
     var improvementIcon: Actor? = null
     var populationIcon: Image? = null //reuse for acquire icon
@@ -19,11 +19,11 @@ class TileGroupIcons(val tileGroup: TileGroup){
     var civilianUnitIcon: UnitGroup? = null
     var militaryUnitIcon: UnitGroup? = null
 
-    fun update(showResourcesAndImprovements: Boolean, showTileYields: Boolean, tileIsViewable: Boolean, showMilitaryUnit: Boolean, viewingCiv:CivilizationInfo?) {
+    fun update(showResourcesAndImprovements: Boolean, showTileYields: Boolean, tileIsViewable: Boolean, showMilitaryUnit: Boolean, viewingCiv: CivilizationInfo?) {
         updateResourceIcon(showResourcesAndImprovements)
         updateImprovementIcon(showResourcesAndImprovements)
 
-        updateYieldIcon(showTileYields) // JN
+        if (viewingCiv != null) updateYieldIcon(showTileYields, viewingCiv)
 
         civilianUnitIcon = newUnitIcon(tileGroup.tileInfo.civilianUnit, civilianUnitIcon,
                 tileIsViewable, -20f, viewingCiv)
@@ -103,7 +103,7 @@ class TileGroupIcons(val tileGroup: TileGroup){
         if (tileGroup.tileInfo.improvement != null && showResourcesAndImprovements) {
             val newImprovementImage = ImageGetter.getImprovementIcon(tileGroup.tileInfo.improvement!!)
             tileGroup.miscLayerGroup.addActor(newImprovementImage)
-            newImprovementImage .run {
+            newImprovementImage.run {
                 setSize(20f, 20f)
                 center(tileGroup)
                 this.x -= 22 // left
@@ -117,7 +117,7 @@ class TileGroupIcons(val tileGroup: TileGroup){
     }
 
     // JN updating display of tile yields
-    private fun updateYieldIcon(showTileYields: Boolean) {
+    private fun updateYieldIcon(showTileYields: Boolean, viewingCiv: CivilizationInfo) {
 
         // Hiding yield icons (in order to update)
         tileGroup.tileYieldGroup.isVisible = false
@@ -125,7 +125,7 @@ class TileGroupIcons(val tileGroup: TileGroup){
 
         if (showTileYields) {
             // Setting up YieldGroup Icon
-            tileGroup.tileYieldGroup.setStats(tileGroup.tileInfo.getTileStats(CivilizationInfo()))
+            tileGroup.tileYieldGroup.setStats(tileGroup.tileInfo.getTileStats(viewingCiv))
             tileGroup.tileYieldGroup.setOrigin(Align.center)
             tileGroup.tileYieldGroup.setScale(0.7f)
             tileGroup.tileYieldGroup.toFront()