diff --git a/tmail-backend/mailbox/team-mailboxes/src/main/scala/com/linagora/tmail/team/TeamMailboxRepository.scala b/tmail-backend/mailbox/team-mailboxes/src/main/scala/com/linagora/tmail/team/TeamMailboxRepository.scala
index 859fd62dcf..955e40521a 100644
--- a/tmail-backend/mailbox/team-mailboxes/src/main/scala/com/linagora/tmail/team/TeamMailboxRepository.scala
+++ b/tmail-backend/mailbox/team-mailboxes/src/main/scala/com/linagora/tmail/team/TeamMailboxRepository.scala
@@ -127,14 +127,9 @@ class TeamMailboxRepositoryImpl @Inject()(mailboxManager: MailboxManager,
   private def createSession(teamMailbox: TeamMailbox): MailboxSession =
     mailboxManager.createSystemSession(teamMailbox.owner)
 
-  private def createSession(domain: Domain): MailboxSession =
-    mailboxManager.createSystemSession(Username.fromLocalPartWithDomain("team-mailbox", domain))
-
   override def listTeamMailboxes(domain: Domain): Publisher[TeamMailbox] =
-    SFlux.fromPublisher(mailboxManager.search(TEAM_MAILBOX_QUERY, createSession(domain)))
-      .filter(mailboxMetaData => mailboxMetaData.getPath.getUser.getDomainPart
-        .filter(domain.equals(_)).isPresent)
-      .flatMapIterable(mailboxMetaData => TeamMailbox.from(mailboxMetaData.getPath))
+    listTeamMailboxes()
+      .filter(teamMailbox => teamMailbox.domain.equals(domain))
       .distinct()
 
   override def listTeamMailboxes(username: Username): Publisher[TeamMailbox] =
@@ -211,7 +206,7 @@ class TeamMailboxRepositoryImpl @Inject()(mailboxManager: MailboxManager,
       .`then`()
   }
 
-  override def listTeamMailboxes(): Publisher[TeamMailbox] = {
+  override def listTeamMailboxes(): SFlux[TeamMailbox] = {
     val session = mailboxManager.createSystemSession(Username.of("team-mailboxes"))
     SFlux.fromIterable(mailboxManager.list(session)
       .asScala
diff --git a/tmail-backend/webadmin/webadmin-team-mailboxes/src/test/java/com/linagora/tmail/webadmin/TeamMailboxManagementRoutesTest.java b/tmail-backend/webadmin/webadmin-team-mailboxes/src/test/java/com/linagora/tmail/webadmin/TeamMailboxManagementRoutesTest.java
index 53aea2ebcf..542beccb61 100644
--- a/tmail-backend/webadmin/webadmin-team-mailboxes/src/test/java/com/linagora/tmail/webadmin/TeamMailboxManagementRoutesTest.java
+++ b/tmail-backend/webadmin/webadmin-team-mailboxes/src/test/java/com/linagora/tmail/webadmin/TeamMailboxManagementRoutesTest.java
@@ -210,6 +210,7 @@ void getTeamMailboxesByDomainShouldReturnListEntryWhenHasMultipleElement() {
                 .body()
                 .asString();
             assertThatJson(response)
+                .withOptions(Option.IGNORING_ARRAY_ORDER)
                 .isEqualTo("[" +
                     "    {" +
                     "        \"name\": \"marketing\"," +