diff --git a/code/datums/helper_datums/tension.dm b/code/datums/helper_datums/tension.dm
index 9780e862180..5d68e28dfe5 100644
--- a/code/datums/helper_datums/tension.dm
+++ b/code/datums/helper_datums/tension.dm
@@ -396,7 +396,7 @@ var/global/datum/tension/tension_master
 		sleep(300)
 		spawn(0)
 			if(candidates.len)
-				while(!theghost && !theghost.client && candidates.len)
+				while((!theghost || !theghost.client) && candidates.len)
 					theghost = pick(candidates)
 					candidates.Remove(theghost)
 				if(!theghost)
@@ -472,7 +472,7 @@ var/global/datum/tension/tension_master
 				syndicate_begin()
 
 				for(var/i = 0, i<numagents,i++)
-					while(!theghost && (!theghost.client) && candidates.len)
+					while((!theghost || !theghost.client) && candidates.len)
 						theghost = pick(candidates)
 						candidates.Remove(theghost)
 					if(!theghost)