diff --git a/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js b/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js
index 4e70afb4c6..1705cc2d7e 100644
--- a/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js
+++ b/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js
@@ -39,10 +39,7 @@ class CivInfoPage extends ReferencePage
 		if(!civInfo)
 			error(sprintf("Error loading civ data for \"%(code)s\"", { "code": civCode }));
 
-		// Update civ gameplay display
 		this.gameplaySection.update(this.activeCiv, civInfo);
-
-		// Update civ history display
 		this.historySection.update(civInfo);
 	}
 
diff --git a/binaries/data/mods/public/gui/reference/civinfo/Sections/HistorySection.js b/binaries/data/mods/public/gui/reference/civinfo/Sections/HistorySection.js
index 35f5326423..5e9abdcec2 100644
--- a/binaries/data/mods/public/gui/reference/civinfo/Sections/HistorySection.js
+++ b/binaries/data/mods/public/gui/reference/civinfo/Sections/HistorySection.js
@@ -9,6 +9,13 @@ class HistorySection
 
 	update(civInfo)
 	{
+		if (!civInfo.History)
+		{
+			this.CivHistoryHeading.caption = "";
+			this.CivHistoryText.caption = "";
+			return;
+		}
+
 		this.CivHistoryHeading.caption =
 			this.page.formatHeading(
 				sprintf(this.headingCaption, { "civilization": civInfo.Name }),
diff --git a/binaries/data/mods/public/gui/reference/structree/StructreePage.js b/binaries/data/mods/public/gui/reference/structree/StructreePage.js
index d5b18984e4..e19edcbfb2 100644
--- a/binaries/data/mods/public/gui/reference/structree/StructreePage.js
+++ b/binaries/data/mods/public/gui/reference/structree/StructreePage.js
@@ -48,7 +48,7 @@ class StructreePage extends ReferencePage
 
 		this.CivEmblem.sprite = "stretched:" + this.civData[this.activeCiv].Emblem;
 		this.CivName.caption = this.civData[this.activeCiv].Name;
-		this.CivHistory.caption = this.civData[this.activeCiv].History;
+		this.CivHistory.caption = this.civData[this.activeCiv].History || "";
 
 		let templateLists = this.TemplateLister.getTemplateLists(this.activeCiv);
 		this.TreeSection.draw(templateLists.structures, this.activeCiv);