diff --git a/backend/oasst_backend/prompt_repository.py b/backend/oasst_backend/prompt_repository.py
index f2119e3b..eb244d3b 100644
--- a/backend/oasst_backend/prompt_repository.py
+++ b/backend/oasst_backend/prompt_repository.py
@@ -947,6 +947,9 @@ class PromptRepository:
         if deleted is not None:
             qry = qry.filter(Message.deleted == deleted)
 
+        if lang is not None:
+            qry = qry.filter(Message.lang == lang)
+
         if desc:
             qry = qry.order_by(Message.created_date.desc(), Message.id.desc())
         else:
@@ -955,9 +958,6 @@ class PromptRepository:
         if limit is not None:
             qry = qry.limit(limit)
 
-        if lang is not None:
-            qry = qry.filter(Message.lang == lang)
-
         return self._add_user_emojis_all(qry)
 
     def update_children_counts(self, message_tree_id: UUID):