diff --git a/irc/nickname.go b/irc/nickname.go
index 4405670b..36b9b6f9 100644
--- a/irc/nickname.go
+++ b/irc/nickname.go
@@ -84,7 +84,7 @@ func performNickChange(server *Server, client *Client, target *Client, session *
 		dispatchAwayNotify(session.client, false, "")
 	}
 
-	for _, channel := range client.Channels() {
+	for _, channel := range target.Channels() {
 		channel.AddHistoryItem(histItem, details.account)
 	}