Index: ps/trunk/binaries/data/mods/public/gamesettings/attributes/PlayerCiv.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gamesettings/attributes/PlayerCiv.js
+++ ps/trunk/binaries/data/mods/public/gamesettings/attributes/PlayerCiv.js
@@ -73,9 +73,7 @@
 
 	pickRandomItems()
 	{
-		// Get a unique array of selectable cultures
-		let cultures = Object.keys(this.settings.civData).filter(civ => this.settings.civData[civ].SelectableInGameSetup).map(civ => this.settings.civData[civ].Culture);
-		cultures = cultures.filter((culture, index) => cultures.indexOf(culture) === index);
+		const civs = Object.keys(this.settings.civData).filter(civ => this.settings.civData[civ].SelectableInGameSetup);
 
 		let picked = false;
 		for (let i in this.values)
@@ -83,12 +81,7 @@
 			if (this.values[i] != "random")
 				continue;
 			picked = true;
-
-			// Pick a random civ of a random culture
-			let culture = pickRandom(cultures);
-			this.values[i] = pickRandom(Object.keys(this.settings.civData).filter(civ =>
-				this.settings.civData[civ].Culture == culture && this.settings.civData[civ].SelectableInGameSetup));
-
+			this.values[i] = pickRandom(civs);
 		}
 		if (picked)
 			this.trigger("values");