diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index bac617fab2..e8d91e40e2 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -4,8 +4,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.8.21"
     const val appName = "Unciv"
-    const val appCodeNumber = 904
-    const val appVersion = "4.7.17"
+    const val appCodeNumber = 905
+    const val appVersion = "4.7.17-patch1"
 
     const val gdxVersion = "1.11.0"
     const val ktorVersion = "2.2.3"
diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt
index 8f56b32943..55563f53fd 100644
--- a/core/src/com/unciv/UncivGame.kt
+++ b/core/src/com/unciv/UncivGame.kt
@@ -536,7 +536,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
 
     companion object {
         //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT
-        val VERSION = Version("4.7.17", 904)
+        val VERSION = Version("4.7.17-patch1", 905)
         //endregion
 
         lateinit var Current: UncivGame
diff --git a/core/src/com/unciv/logic/map/tile/TileInfoImprovementFunctions.kt b/core/src/com/unciv/logic/map/tile/TileInfoImprovementFunctions.kt
index d8c29e7805..703467aa96 100644
--- a/core/src/com/unciv/logic/map/tile/TileInfoImprovementFunctions.kt
+++ b/core/src/com/unciv/logic/map/tile/TileInfoImprovementFunctions.kt
@@ -208,7 +208,7 @@ class TileInfoImprovementFunctions(val tile: Tile) {
         val city = tile.owningCity
         if (city != null) {
             city.cityStats.update()
-            city.civ.cache.updateCivResources()
+            if (civToActivateBroaderEffects!=null) city.civ.cache.updateCivResources()
             city.reassignPopulationDeferred()
         }
     }
diff --git a/core/src/com/unciv/logic/multiplayer/OnlineMultiplayer.kt b/core/src/com/unciv/logic/multiplayer/OnlineMultiplayer.kt
index ba01564497..caecb9e914 100644
--- a/core/src/com/unciv/logic/multiplayer/OnlineMultiplayer.kt
+++ b/core/src/com/unciv/logic/multiplayer/OnlineMultiplayer.kt
@@ -21,9 +21,11 @@ import com.unciv.utils.withGLContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.isActive
 import java.time.Duration
 import java.time.Instant
 import java.util.Collections
@@ -63,7 +65,7 @@ class OnlineMultiplayer {
         multiplayerGameUpdater = flow<Unit> {
             while (true) {
                 delay(500)
-
+                if (!currentCoroutineContext().isActive) return@flow
                 val currentGame = getCurrentGame()
                 val multiplayerSettings = UncivGame.Current.settings.multiplayer
                 val preview = currentGame?.preview