diff --git a/code/controllers/subsystem/ping.dm b/code/controllers/subsystem/ping.dm
index fbe2a7ad7d2..1f07ce2e76c 100644
--- a/code/controllers/subsystem/ping.dm
+++ b/code/controllers/subsystem/ping.dm
@@ -20,7 +20,7 @@ var/datum/subsystem/ping/SSping
 	while (length(currentrun))
 		var/client/C = currentrun[currentrun.len]
 		currentrun.len--
-		if (!C || world.time - C.connection_time < PING_BUFFER_TIME)
+		if (!C || world.time - C.connection_time < PING_BUFFER_TIME || C.inactivity >= (wait-1))
 			if (MC_TICK_CHECK)
 				return
 			continue
@@ -30,4 +30,4 @@ var/datum/subsystem/ping/SSping
 
 	currentrun = null
 
-#undef PING_BUFFER_TIME
\ No newline at end of file
+#undef PING_BUFFER_TIME