diff --git a/federationapi/storage/shared/storage.go b/federationapi/storage/shared/storage.go
index 7d6e8a684..f86ae2e0d 100644
--- a/federationapi/storage/shared/storage.go
+++ b/federationapi/storage/shared/storage.go
@@ -125,7 +125,9 @@ func (d *Database) GetJoinedHostsForRooms(ctx context.Context, roomIDs []string,
 	if excludeSelf {
 		for i, server := range servers {
 			if d.IsLocalServerName(server) {
-				servers = append(servers[:i], servers[i+1:]...)
+				copy(servers[:i], servers[i+1:])
+				servers = servers[:len(servers)-1]
+				break
 			}
 		}
 	}