diff --git a/extensions/conversational-extension/src/index.ts b/extensions/conversational-extension/src/index.ts
index b3530e5d5..854773556 100644
--- a/extensions/conversational-extension/src/index.ts
+++ b/extensions/conversational-extension/src/index.ts
@@ -40,7 +40,7 @@ export default class CortexConversationalExtension extends ConversationalExtensi
   async listThreads(): Promise<Thread[]> {
     return this.queue.add(() =>
       ky
-        .get(`${API_URL}/v1/threads`)
+        .get(`${API_URL}/v1/threads?limit=-1`)
         .json<ThreadList>()
         .then((e) => e.data)
     ) as Promise<Thread[]>
@@ -133,7 +133,7 @@ export default class CortexConversationalExtension extends ConversationalExtensi
   async listMessages(threadId: string): Promise<ThreadMessage[]> {
     return this.queue.add(() =>
       ky
-        .get(`${API_URL}/v1/threads/${threadId}/messages?order=asc`)
+        .get(`${API_URL}/v1/threads/${threadId}/messages?order=asc&limit=-1`)
         .json<MessageList>()
         .then((e) => e.data)
     ) as Promise<ThreadMessage[]>
@@ -147,7 +147,7 @@ export default class CortexConversationalExtension extends ConversationalExtensi
    */
   async getThreadAssistant(threadId: string): Promise<ThreadAssistantInfo> {
     return this.queue.add(() =>
-      ky.get(`${API_URL}/v1/assistants/${threadId}`).json<ThreadAssistantInfo>()
+      ky.get(`${API_URL}/v1/assistants/${threadId}?limit=-1`).json<ThreadAssistantInfo>()
     ) as Promise<ThreadAssistantInfo>
   }
   /**
diff --git a/extensions/inference-cortex-extension/bin/version.txt b/extensions/inference-cortex-extension/bin/version.txt
index cf13dd42b..90a27f9ce 100644
--- a/extensions/inference-cortex-extension/bin/version.txt
+++ b/extensions/inference-cortex-extension/bin/version.txt
@@ -1 +1 @@
-1.0.5-rc2
+1.0.5
diff --git a/extensions/model-extension/src/cortex.ts b/extensions/model-extension/src/cortex.ts
index 26316fbbc..ca5763962 100644
--- a/extensions/model-extension/src/cortex.ts
+++ b/extensions/model-extension/src/cortex.ts
@@ -53,7 +53,7 @@ export class CortexAPI implements ICortexAPI {
    */
   getModels(): Promise<Model[]> {
     return this.queue
-      .add(() => ky.get(`${API_URL}/v1/models`).json<ModelList>())
+      .add(() => ky.get(`${API_URL}/v1/models?limit=-1`).json<ModelList>())
       .then((e) =>
         typeof e === 'object' ? e.data.map((e) => this.transformModel(e)) : []
       )
diff --git a/web/containers/Providers/ModelHandler.tsx b/web/containers/Providers/ModelHandler.tsx
index 3a6c19e0d..d838df324 100644
--- a/web/containers/Providers/ModelHandler.tsx
+++ b/web/containers/Providers/ModelHandler.tsx
@@ -244,6 +244,7 @@ export default function ModelHandler() {
       const metadata = {
         ...thread.metadata,
         ...(messageContent && { lastMessage: messageContent }),
+        updated_at: Date.now(),
       }
 
       updateThread({
diff --git a/web/hooks/useCreateNewThread.ts b/web/hooks/useCreateNewThread.ts
index c4c77d0a4..1e1f7a849 100644
--- a/web/hooks/useCreateNewThread.ts
+++ b/web/hooks/useCreateNewThread.ts
@@ -153,6 +153,7 @@ export const useCreateNewThread = () => {
       updated: createdAt,
       metadata: {
         title: 'New Thread',
+        updated_at: Date.now(),
       },
     }
 
diff --git a/web/hooks/useThreads.ts b/web/hooks/useThreads.ts
index 1e3b428a9..00ad35457 100644
--- a/web/hooks/useThreads.ts
+++ b/web/hooks/useThreads.ts
@@ -26,7 +26,12 @@ const useThreads = () => {
 
   useEffect(() => {
     const getThreads = async () => {
-      const localThreads = await getLocalThreads()
+      const localThreads = (await getLocalThreads()).sort((a, b) => {
+        return ((a.metadata?.updated_at as number) ?? 0) >
+          ((b.metadata?.updated_at as number) ?? 0)
+          ? -1
+          : 1
+      })
       const localThreadStates: Record<string, ThreadState> = {}
       const threadModelParams: Record<string, ModelParams> = {}
 
diff --git a/web/package.json b/web/package.json
index db57facb5..b0411e779 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@janhq/web",
-  "version": "0.5.11",
+  "version": "0.5.12",
   "private": true,
   "homepage": "./",
   "scripts": {