diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm
index 602ef7f5f5..e01b525e02 100644
--- a/code/datums/world_topic.dm
+++ b/code/datums/world_topic.dm
@@ -103,8 +103,8 @@
 /datum/world_topic/server_hop/Run(list/input, addr)
 	var/expected_key = input[keyword]
 	for(var/mob/dead/observer/O in GLOB.player_list)
-		if(O.key == expected_key && O.client?.address == addr)
-			if(O.client)
+		if(O.key == expected_key)
+			if(O.client?.address == addr)
 				new /obj/screen/splash(O.client, TRUE)
 			break