diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 70c26674305..7ebb2b727e2 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -438,6 +438,13 @@ GLOBAL_LIST_EMPTY(the_station_areas)
 		message_admins("Failed to set new map with next_map.json for [VM.map_name]! Using default as backup!")
 		return
 
+	if (VM.config_min_users > 0 && GLOB.clients.len < VM.config_min_users)
+		message_admins("[VM.map_name] was chosen for the next map, despite there being less current players than its set minimum population range!")
+		log_game("[VM.map_name] was chosen for the next map, despite there being less current players than its set minimum population range!")
+	if (VM.config_max_users > 0 && GLOB.clients.len > VM.config_max_users)
+		message_admins("[VM.map_name] was chosen for the next map, despite there being more current players than its set maximum population range!")
+		log_game("[VM.map_name] was chosen for the next map, despite there being more current players than its set maximum population range!")
+
 	next_map_config = VM
 	return TRUE
 
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 178d932f53c..09b2e698ff4 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -197,6 +197,10 @@ SUBSYSTEM_DEF(vote)
 					var/datum/map_config/VM = config.maplist[map]
 					if(!VM.votable || (VM.map_name in SSpersistence.blocked_maps) || GLOB.clients.len >= VM.config_max_users || GLOB.clients.len <= VM.config_min_users) //SKYRAT EDIT CHANGE - ORIGINAL: if(!VM.votable || (VM.map_name in SSpersistence.blocked_maps))
 						continue
+					if (VM.config_min_users > 0 && GLOB.clients.len < VM.config_min_users)
+						continue
+					if (VM.config_max_users > 0 && GLOB.clients.len > VM.config_max_users)
+						continue
 					maps += VM.map_name
 					shuffle_inplace(maps)
 				for(var/valid_map in maps)