diff --git a/server.go b/server.go
index 5c4254d..4001788 100644
--- a/server.go
+++ b/server.go
@@ -167,6 +167,9 @@ func (s *Server) upstreamWorker() {
 
 			case libnmdc.EVENT_CONNECTION_STATE_CHANGED:
 				s.reply(rplMsg, BLANK_NICK, BLESSED_CHANNEL, "* Upstream: "+hubEvent.StateChange.Format())
+				if hubEvent.StateChange == libnmdc.CONNECTIONSTATE_CONNECTED {
+					s.sendNames() // delay doing this until now
+				}
 
 			case libnmdc.EVENT_HUBNAME_CHANGED:
 				s.sendChannelTopic(hubEvent.Nick)
@@ -309,7 +312,7 @@ func (s *Server) handleRegisteredCommand(command string, args []string) {
 				s.reply(rplJoin, s.upstreamLauncher.Self.Nick, BLESSED_CHANNEL)
 
 				// Send (initially just us) nicklist for the chat channel
-				s.sendNames()
+				//s.sendNames()
 
 				// Spawn upstream connection
 				s.upstream = s.upstreamLauncher.Connect()