diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index baa0adc07ec..e481fe92e16 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -242,6 +242,9 @@
 	// Lavaland
 	var/lavaland_budget = 60
 
+	// Makes gamemodes respect player limits
+	var/enable_gamemode_player_limit = 0
+
 /datum/configuration/New()
 	for(var/T in subtypesof(/datum/game_mode))
 		var/datum/game_mode/M = T
@@ -720,6 +723,8 @@
 					config.developer_express_start = 1
 				if("disable_localhost_admin")
 					config.disable_localhost_admin = 1
+				if("enable_gamemode_player_limit")
+					config.enable_gamemode_player_limit = 1
 				else
 					log_config("Unknown setting in configuration: '[name]'")
 
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index aa366415f31..e7fb9b4969f 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -50,7 +50,7 @@
 		if((player.client)&&(player.ready))
 			playerC++
 
-	if(playerC >= required_players)
+	if(!config.enable_gamemode_player_limit || (playerC >= required_players))
 		return 1
 	return 0
 
diff --git a/config/example/config.txt b/config/example/config.txt
index 183f85437f0..7dfdc1e413a 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -439,6 +439,8 @@ HIGH_POP_MC_MODE_AMOUNT 65
 ##Disengage high pop mode if player count drops below this
 DISABLE_HIGH_POP_MC_MODE_AMOUNT 60
 
+##Developer options
+
 ##Uncomment to enable developer start. Auto starts the server after initialization
 ##DEVELOPER_EXPRESS_START
 
@@ -447,3 +449,6 @@ DISABLE_HIGH_POP_MC_MODE_AMOUNT 60
 
 ## Uncomment to give a confirmation before hitting start now
 #START_NOW_CONFIRMATION
+
+## If uncommented, all gamemodes will respect the number of required players. Defaults to no.
+#ENABLE_GAMEMODE_PLAYER_LIMIT
\ No newline at end of file