diff --git a/src/app/common/services/server.service.ts b/src/app/common/services/server.service.ts
index 534907d..1f2847c 100644
--- a/src/app/common/services/server.service.ts
+++ b/src/app/common/services/server.service.ts
@@ -40,19 +40,7 @@ export class ServerService {
 
     public getPublicServers$(): Observable<Server[]> {
         return from(environment.pb.collection('public_servers').getFullList()).pipe(
-            map(servers =>
-                servers.map(server => ({ id: server['id'], name: server['name'], owner: server['owner'], riders: 0 }))
-            ),
-            mergeAll(),
-            concatMap(server => {
-                return this.getRiders$(server.id).pipe(
-                    map(riders => {
-                        server.riders = riders.length;
-                        return server;
-                    })
-                );
-            }),
-            reduce((acc, server) => [...acc, server], [] as Server[])
+            map(servers => servers.map(server => ({ id: server['id'], name: server['name'], owner: server['owner'] })))
         );
     }