diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt
index 16da425324..1bdf041730 100644
--- a/core/src/com/unciv/models/ruleset/Building.kt
+++ b/core/src/com/unciv/models/ruleset/Building.kt
@@ -46,7 +46,6 @@ class Building : NamedStats(), IConstruction {
      */
     var resourceBonusStats: Stats? = null
 
-
     fun getShortDescription(ruleset: Ruleset): String { // should fit in one line
         val infoList= mutableListOf<String>()
         val str = getStats(null).toString()
diff --git a/core/src/com/unciv/models/ruleset/Nation.kt b/core/src/com/unciv/models/ruleset/Nation.kt
index 96915a2cbb..56cffd2146 100644
--- a/core/src/com/unciv/models/ruleset/Nation.kt
+++ b/core/src/com/unciv/models/ruleset/Nation.kt
@@ -114,7 +114,7 @@ class Nation : INamed {
 
     private fun addUniqueBuildingsText(textList: ArrayList<String>, ruleset: Ruleset) {
         for (building in ruleset.buildings.values
-                .filter { it.uniqueTo == name }) {
+                .filter { it.uniqueTo == name && "Will not be displayed in Civilopedia" !in it.uniques}) {
             if (building.replaces == null) textList += building.getShortDescription(ruleset)
             else {
                 val originalBuilding = ruleset.buildings[building.replaces!!]!!
@@ -142,7 +142,7 @@ class Nation : INamed {
 
     private fun addUniqueUnitsText(textList: ArrayList<String>, ruleset: Ruleset) {
         for (unit in ruleset.units.values
-                .filter { it.uniqueTo == name }) {
+                .filter { it.uniqueTo == name && "Will not be displayed in Civilopedia" !in it.uniques}) {
             if (unit.replaces != null) {
                 val originalUnit = ruleset.units[unit.replaces!!]!!
                 textList += unit.name.tr() + " - " + "Replaces [${originalUnit.name}]".tr()
diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
index da5dd9e068..931933b1c4 100644
--- a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
+++ b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
@@ -39,7 +39,6 @@ class BaseUnit : INamed, IConstruction {
     var uniqueTo:String?=null
     var attackSound:String?=null
 
-
     fun getShortDescription(): String {
         val infoList = mutableListOf<String>()
         if (strength != 0) infoList += "$strength${Fonts.strength}"
diff --git a/core/src/com/unciv/ui/CivilopediaScreen.kt b/core/src/com/unciv/ui/CivilopediaScreen.kt
index fcb282d29c..d57eaa3f11 100644
--- a/core/src/com/unciv/ui/CivilopediaScreen.kt
+++ b/core/src/com/unciv/ui/CivilopediaScreen.kt
@@ -49,6 +49,7 @@ class CivilopediaScreen(ruleset: Ruleset) : CameraStageBaseScreen() {
         onBackButtonClicked { UncivGame.Current.setWorldScreen() }
 
         categoryToEntries["Buildings"] = ruleset.buildings.values
+                .filter { "Will not be displayed in Civilopedia" !in it.uniques }
                 .map { CivilopediaEntry(it.name,it.getDescription(false, null,ruleset),
                         ImageGetter.getConstructionImage(it.name).surroundWithCircle(50f)) }
         categoryToEntries["Resources"] = ruleset.tileResources.values
@@ -61,6 +62,7 @@ class CivilopediaScreen(ruleset: Ruleset) : CameraStageBaseScreen() {
                 .map { CivilopediaEntry(it.name,it.getDescription(ruleset,false),
                         ImageGetter.getImprovementIcon(it.name,50f)) }
         categoryToEntries["Units"] = ruleset.units.values
+                .filter { "Will not be displayed in Civilopedia" !in it.uniques }
                 .map { CivilopediaEntry(it.name,it.getDescription(false),
                         ImageGetter.getConstructionImage(it.name).surroundWithCircle(50f)) }
         categoryToEntries["Nations"] = ruleset.nations.values