diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 3727a16c3..8ef1a46ca 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -249,7 +249,7 @@ const activeAssigneeTabCount = computed(() => {
 });
 
 const conversationListPagination = computed(() => {
-  const conversationsPerPage = 25;
+  const conversationsPerPage = wootConstants.CONVERSATIONS_PER_PAGE;
   const hasChatsOnView =
     chatsOnView.value &&
     Array.isArray(chatsOnView.value) &&
@@ -339,7 +339,10 @@ const conversationList = computed(() => {
     });
   }
 
-  return localConversationList;
+  // Clip to current page size to fix pagination order bug
+  const maxItems =
+    currentFiltersPage.value * wootConstants.CONVERSATIONS_PER_PAGE;
+  return localConversationList.slice(0, maxItems);
 });
 
 const showEndOfListMessage = computed(() => {
diff --git a/app/javascript/dashboard/constants/globals.js b/app/javascript/dashboard/constants/globals.js
index 85dab459c..54994f2c7 100644
--- a/app/javascript/dashboard/constants/globals.js
+++ b/app/javascript/dashboard/constants/globals.js
@@ -1,5 +1,6 @@
 export default {
   GRAVATAR_URL: 'https://www.gravatar.com/avatar/',
+  CONVERSATIONS_PER_PAGE: 25,
   ASSIGNEE_TYPE: {
     ME: 'me',
     UNASSIGNED: 'unassigned',