diff --git a/chatto/src/main/javascript/ts/src/model/ChatModelHelper.ts b/chatto/src/main/javascript/ts/src/model/ChatModelHelper.ts
index e988b92..d53ec9a 100644
--- a/chatto/src/main/javascript/ts/src/model/ChatModelHelper.ts
+++ b/chatto/src/main/javascript/ts/src/model/ChatModelHelper.ts
@@ -148,7 +148,7 @@ export class ChatModelHelper {
       return;
     }
     headers.append("X-AUTH-TOKEN", JsonAPI.authToken);
-    const url = Sprintf(JsonAPI.CHAT_MESSAGE_PAGE_GET, toUser, page, 5);
+    const url = Sprintf(JsonAPI.CHAT_MESSAGE_PAGE_GET, toUser, page, JsonAPI.CHAT_PAGE_SIZE);
     log.debug(url);
     const response = await fetch(url, {
       method: "GET",
diff --git a/chatto/src/main/javascript/ts/src/singleton/JsonAPI.ts b/chatto/src/main/javascript/ts/src/singleton/JsonAPI.ts
index 691c608..e103a16 100644
--- a/chatto/src/main/javascript/ts/src/singleton/JsonAPI.ts
+++ b/chatto/src/main/javascript/ts/src/singleton/JsonAPI.ts
@@ -2,6 +2,7 @@ export namespace JsonAPI {
   export let principleName: string = localStorage.getItem("username") || "";
   export let contactName: string = "";
   export let authToken: string = localStorage.getItem("authToken") || "";
+  export const CHAT_PAGE_SIZE: number = parseInt(localStorage.getItem("CHAT_PAGE_SIZE") || "9") || 9;
   export const ACTIVE_USERS_GET = `/api/chat/get/active-users`;
   /**
    * Json API URL for retrieving all messages between two users
diff --git a/chatto/src/main/resources/application.properties b/chatto/src/main/resources/application.properties
index 5fc75bf..5933c33 100644
--- a/chatto/src/main/resources/application.properties
+++ b/chatto/src/main/resources/application.properties
@@ -23,4 +23,5 @@ logging.level.org.springframework.cache=DEBUG
 chatto.token.timeout-duration=30
 chat-bundle=bundle.js
 # spring.devtools.add-properties=false
-chatto.frontend.log-level=TRACE
\ No newline at end of file
+chatto.frontend.log-level=TRACE
+chatto.frontend.chat-page-size=9
\ No newline at end of file
diff --git a/chatto/src/main/resources/templates/fragments/head.html b/chatto/src/main/resources/templates/fragments/head.html
index b0a78f4..e8399bf 100644
--- a/chatto/src/main/resources/templates/fragments/head.html
+++ b/chatto/src/main/resources/templates/fragments/head.html
@@ -63,6 +63,9 @@
         <script th:inline="javascript" defer>
             let loglevel = /*[[${@environment.getProperty('chatto.frontend.log-level')}]]*/ "DEBUG";
             window.log.setLevel(loglevel)
+
+            let chatPageSize = /*[[${@environment.getProperty('chatto.frontend.chat-page-size')}]]*/ 9;
+            localStorage.setItem("CHAT_PAGE_SIZE", chatPageSize);
         </script>
 
         <meta charset="UTF-8">