diff --git a/downstream.go b/downstream.go
index 3c80800..cc565d0 100644
--- a/downstream.go
+++ b/downstream.go
@@ -1379,7 +1379,11 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
 
 		var params []string
 		if target != "" {
-			params = []string{target, upstreamNick}
+			if target == mask { // WHOIS nick nick
+				params = []string{upstreamNick, upstreamNick}
+			} else {
+				params = []string{target, upstreamNick}
+			}
 		} else {
 			params = []string{upstreamNick}
 		}