diff --git a/server/server.go b/server/server.go
index 426d96208fa..f6acf2773b7 100644
--- a/server/server.go
+++ b/server/server.go
@@ -4472,6 +4472,10 @@ func (s *Server) DisconnectClientByID(id uint64) error {
 		client.closeConnection(Kicked)
 		return nil
 	}
+	if client := s.GetLeafNode(id); client != nil {
+		client.closeConnection(Kicked)
+		return nil
+	}
 	return errors.New("no such client id")
 }