diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
index 7b8007755b..1df8fc11e6 100644
--- a/code/game/machinery/camera/tracking.dm
+++ b/code/game/machinery/camera/tracking.dm
@@ -58,12 +58,12 @@
 			human = 1
 
 		var/name = M.name
-		if (name in track.names)
+		while(name in track.names)
 			track.namecounts[name]++
 			name = text("[] ([])", name, track.namecounts[name])
-		else
-			track.names.Add(name)
-			track.namecounts[name] = 1
+		track.names.Add(name)
+		track.namecounts[name] = 1
+
 		if(human)
 			track.humans[name] = M
 		else