diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm
index e843e61a035..a0ec2bab7c5 100644
--- a/code/controllers/subsystem/events.dm
+++ b/code/controllers/subsystem/events.dm
@@ -64,8 +64,8 @@ var/datum/subsystem/events/SSevent
 	for(var/datum/round_event_control/E in control)
 		if(E.occurrences >= E.max_occurrences)	continue
 		if(E.earliest_start >= world.time)		continue
-		if(ticker.mode.config_tag in E.gamemode_blacklist) continue
-		if(E.gamemode_whitelist && !(ticker.mode.config_tag in E.gamemode_whitelist)) continue
+		if(E.gamemode_blacklist.len && (ticker.mode.config_tag in E.gamemode_blacklist)) continue
+		if(E.gamemode_whitelist.len && !(ticker.mode.config_tag in E.gamemode_whitelist)) continue
 		if(E.holidayID)
 			if(!holidays || !holidays[E.holidayID])			continue
 		if(E.weight < 0)						//for round-start events etc.
@@ -83,8 +83,8 @@ var/datum/subsystem/events/SSevent
 	for(var/datum/round_event_control/E in control)
 		if(E.occurrences >= E.max_occurrences)	continue
 		if(E.earliest_start >= world.time)		continue
-		if(ticker.mode.config_tag in E.gamemode_blacklist) continue
-		if(E.gamemode_whitelist && !(ticker.mode.config_tag in E.gamemode_whitelist)) continue
+		if(E.gamemode_blacklist.len && (ticker.mode.config_tag in E.gamemode_blacklist)) continue
+		if(E.gamemode_whitelist.len && !(ticker.mode.config_tag in E.gamemode_whitelist)) continue
 		if(E.holidayID)
 			if(!holidays || !holidays[E.holidayID])			continue
 		sum_of_weights -= E.weight
@@ -98,7 +98,6 @@ var/datum/subsystem/events/SSevent
 			log_game("Random Event triggering: [E.name] ([E.typepath])")
 			return
 
-
 /datum/round_event/proc/findEventArea() //Here's a nice proc to use to find an area for your event to land in!
 	var/list/safe_areas = list(
 	/area/turret_protected/ai,
diff --git a/code/modules/events/event.dm b/code/modules/events/event.dm
index 6d555cc8448..722f6556868 100644
--- a/code/modules/events/event.dm
+++ b/code/modules/events/event.dm
@@ -20,8 +20,8 @@
 	var/alertadmins = 1			//should we let the admins know this event is firing
 								//should be disabled on events that fire a lot
 
-	var/gamemode_blacklist = list() // Event won't happen in these gamemodes
-	var/gamemode_whitelist = list() // Event will happen ONLY in these gamemodes if not empty
+	var/list/gamemode_blacklist = list() // Event won't happen in these gamemodes
+	var/list/gamemode_whitelist = list() // Event will happen ONLY in these gamemodes if not empty
 
 /datum/round_event_control/wizard
 	wizardevent = 1