diff --git a/code/controllers/subsystem/polling.dm b/code/controllers/subsystem/polling.dm
index 1495e48c7ab..5e7ee0fb0f4 100644
--- a/code/controllers/subsystem/polling.dm
+++ b/code/controllers/subsystem/polling.dm
@@ -79,13 +79,13 @@ SUBSYSTEM_DEF(polling)
 	for(var/mob/candidate_mob as anything in group)
 		if(!candidate_mob.client)
 			continue
-		// Universal opt-out for all players if it's for a role.
-		if(role && (!candidate_mob.client.prefs.read_preference(/datum/preference/toggle/ghost_roles)))
+		// Universal opt-out for all players.
+		if(!candidate_mob.client.prefs.read_preference(/datum/preference/toggle/ghost_roles))
 			continue
 		// Opt-out for admins whom are currently adminned.
-		if(role && (!candidate_mob.client.prefs.read_preference(/datum/preference/toggle/ghost_roles_as_admin)) && candidate_mob.client.holder)
+		if((!candidate_mob.client.prefs.read_preference(/datum/preference/toggle/ghost_roles_as_admin)) && candidate_mob.client.holder)
 			continue
-		if(role && !is_eligible(candidate_mob, role, check_jobban, ignore_category))
+		if(!is_eligible(candidate_mob, role, check_jobban, ignore_category))
 			continue
 
 		if(start_signed_up)