diff --git a/irc/commands.go b/irc/commands.go
index e058a3e7..c505721b 100644
--- a/irc/commands.go
+++ b/irc/commands.go
@@ -309,8 +309,9 @@ func init() {
 			minParams:    4,
 		},
 		"WHO": {
-			handler:   whoHandler,
-			minParams: 1,
+			handler:         whoHandler,
+			minParams:       1,
+			leaveClientIdle: true,
 		},
 		"WHOIS": {
 			handler:   whoisHandler,