diff --git a/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt b/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
index 3286bc1fd4..7f251553ae 100644
--- a/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
+++ b/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
@@ -216,7 +216,7 @@ class CityInfoConquestFunctions(val city: CityInfo){
                 }
             }
             
-            religion.removeUnknownPantheons()
+            if (civInfo.gameInfo.hasReligionEnabled()) religion.removeUnknownPantheons()
 
             tryUpdateRoadStatus()
         }
diff --git a/core/src/com/unciv/logic/city/CityReligion.kt b/core/src/com/unciv/logic/city/CityReligion.kt
index 4438a8864e..16af848e55 100644
--- a/core/src/com/unciv/logic/city/CityReligion.kt
+++ b/core/src/com/unciv/logic/city/CityReligion.kt
@@ -171,6 +171,7 @@ class CityInfoReligionManager {
      */
     fun removeUnknownPantheons() {
         for (pressure in pressures) {
+            if (pressure.key == Constants.noReligionName) continue
             val correspondingReligion = cityInfo.civInfo.gameInfo.religions[pressure.key]!!
             if (correspondingReligion.isPantheon() 
                 && correspondingReligion.foundingCivName != cityInfo.civInfo.civName