diff --git a/irc/server.go b/irc/server.go
index c3f8d678..07b8ba22 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -479,7 +479,9 @@ func (client *Client) getWhoisOf(target *Client, hasPrivs bool, rb *ResponseBuff
 
 	whoischannels := client.whoisChannelsNames(target, rb.session.capabilities.Has(caps.MultiPrefix), oper.HasRoleCapab("sajoin"))
 	if whoischannels != nil {
-		rb.Add(nil, client.server.name, RPL_WHOISCHANNELS, cnick, tnick, strings.Join(whoischannels, " "))
+		for _, line := range utils.BuildTokenLines(400, whoischannels, " ") {
+			rb.Add(nil, client.server.name, RPL_WHOISCHANNELS, cnick, tnick, line)
+		}
 	}
 	if target.HasMode(modes.Operator) && operStatusVisible(client, target, oper != nil) {
 		tOper := target.Oper()