diff --git a/minetest.conf b/minetest.conf
index e5c830d..c431733 100644
--- a/minetest.conf
+++ b/minetest.conf
@@ -21,7 +21,6 @@ ctf.diplomacy = false
 ctf.players_can_change_team = false
 ctf.node_ownership = false
 ctf.friendly_fire = false
-ctf.remove_player_on_leave = true
 ctf.autoalloc_on_joinplayer = true
 
 ctf.match = true
@@ -30,6 +29,7 @@ ctf.match.clear_inv = true
 ctf.match.destroy_team = true
 ctf.match.reset_on_winner = true
 ctf.match.map_reset_limit = 160
+ctf.match.remove_player_on_leave
 
 ctf.gui.tab.flags = false
 ctf.gui.tab.settings = false
diff --git a/settings_cache.csv b/settings_cache.csv
index 97c2ea2..6357fc4 100644
--- a/settings_cache.csv
+++ b/settings_cache.csv
@@ -29,7 +29,7 @@
 "match.clear_inv"   true
 "match.destroy_team"   true
 "match.map_reset_limit"   60
-"match.remove_player_on_leave"   false
+"match.remove_player_on_leave"   true
 "match.teams"   "red, red, 15, 7, 39; blue, blue, -9, 9, -43"
 "maximum_in_team"   -1
 "node_ownership"   false