diff --git a/irc/server.go b/irc/server.go
index 06c82320..5cd4b9d7 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -370,10 +370,6 @@ func (m *WhoisCommand) HandleServer(server *Server) {
 	client := m.Client()
 
 	// TODO implement target query
-	if m.target != "" {
-		client.Reply(ErrNoSuchServer(server, m.target))
-		return
-	}
 
 	for _, mask := range m.masks {
 		// TODO implement wildcard matching