diff --git a/downstream.go b/downstream.go
index d524e7b..325bdb5 100644
--- a/downstream.go
+++ b/downstream.go
@@ -1201,7 +1201,7 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
 			})
 		})
 
-		if dc.upstream() == nil && dc.nick != nick {
+		if dc.upstream() == nil && upstream == nil && dc.nick != nick {
 			dc.SendMessage(&irc.Message{
 				Prefix:  dc.prefix(),
 				Command: "NICK",