diff --git a/irc/handlers.go b/irc/handlers.go
index 7a269647..a956af10 100644
--- a/irc/handlers.go
+++ b/irc/handlers.go
@@ -1373,6 +1373,9 @@ func kickHandler(server *Server, client *Client, msg ircmsg.Message, rb *Respons
 	if len(msg.Params) > 2 {
 		comment = msg.Params[2]
 	}
+	if comment == "" {
+		comment = client.Nick()
+	}
 	for _, kick := range kicks {
 		channel := server.channels.Get(kick.channel)
 		if channel == nil {
@@ -1385,10 +1388,6 @@ func kickHandler(server *Server, client *Client, msg ircmsg.Message, rb *Respons
 			rb.Add(nil, server.name, ERR_NOSUCHNICK, client.nick, utils.SafeErrorParam(kick.nick), client.t("No such nick"))
 			continue
 		}
-
-		if comment == "" {
-			comment = kick.nick
-		}
 		channel.Kick(client, target, comment, rb, hasPrivs)
 	}
 	return false