diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunks.java b/common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunks.java
index 91418d4b..174f6300 100644
--- a/common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunks.java
+++ b/common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunks.java
@@ -573,6 +573,9 @@ private void teamPropertiesChanged(TeamPropertiesChangedEvent event) {
 
 		if (event.getPreviousProperties().get(FTBChunksProperties.CLAIM_VISIBILITY) != event.getTeam().getProperty(FTBChunksProperties.CLAIM_VISIBILITY)) {
 			// team is showing or hiding claims; sync all their claims to all players
+			if(FTBChunksWorldConfig.CLAIM_VISIBILITY_OVERRIDE.get()) {
+				event.getTeam().setProperty(FTBChunksProperties.CLAIM_VISIBILITY, event.getPreviousProperties().get(FTBChunksProperties.CLAIM_VISIBILITY));
+			}
 			ChunkTeamDataImpl teamData = ClaimedChunkManagerImpl.getInstance().getOrCreateData(event.getTeam());
 			teamData.syncChunksToAll(server);
 		}
diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunksWorldConfig.java b/common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunksWorldConfig.java
index 443c92e2..88e1866c 100644
--- a/common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunksWorldConfig.java
+++ b/common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunksWorldConfig.java
@@ -41,6 +41,8 @@ public interface FTBChunksWorldConfig {
 			.comment("If true, the player must have the 'ftbchunks_mapping' Game stage to be able to use the map and minimap.\nRequires KubeJS and/or Gamestages to be installed.");
 	BooleanValue LOCATION_MODE_OVERRIDE = CONFIG.addBoolean("location_mode_override", false)
 			.comment("If true, \"Location Visibility\" team settings are ignored, and all players can see each other anywhere on the map.");
+	BooleanValue CLAIM_VISIBILITY_OVERRIDE = CONFIG.addBoolean("claim_visibility_override", false)
+			.comment("If true, \"Claim Visibility\" team settings are ignored, and all claims are visible to all players.");
 
 	SNBTConfig FAKE_PLAYERS = CONFIG.addGroup("fake_players");
 	EnumValue<ProtectionPolicy> ALLOW_FAKE_PLAYERS = FAKE_PLAYERS.addEnum("fake_players", NameMap.of(ProtectionPolicy.CHECK, ProtectionPolicy.values()).create())