diff --git a/web-app/src/hooks/__tests__/useThreads.test.ts b/web-app/src/hooks/__tests__/useThreads.test.ts
index 3c7915206..12caa5b59 100644
--- a/web-app/src/hooks/__tests__/useThreads.test.ts
+++ b/web-app/src/hooks/__tests__/useThreads.test.ts
@@ -88,7 +88,7 @@ describe('useThreads', () => {
     })
 
     expect(Object.keys(result.current.threads)).toHaveLength(2)
-    expect(result.current.threads['thread1'].model.id).toEqual('thread1:free')
+    expect(result.current.threads['thread1'].model.id).toEqual('thread1/free')
     expect(result.current.threads['thread1'].model.provider).toEqual('llamacpp')
     expect(result.current.threads['thread2'].model.id).toEqual('thread2/test')
     expect(result.current.threads['thread2'].model.provider).toEqual('llamacpp')
diff --git a/web-app/src/hooks/useThreads.ts b/web-app/src/hooks/useThreads.ts
index c9e88d097..c74d67e02 100644
--- a/web-app/src/hooks/useThreads.ts
+++ b/web-app/src/hooks/useThreads.ts
@@ -44,9 +44,11 @@ export const useThreads = create<ThreadState>()((set, get) => ({
                   'llamacpp'
                 ),
                 // Cortex migration: take first two parts of the ID (the last is file name which is not needed)
-                id: !thread.model?.id.endsWith(':free')
-                  ? thread.model?.id.split(':').slice(0, 2).join(sep())
-                  : thread.model?.id,
+                id:
+                  thread.model.provider === 'llama.cpp' ||
+                  thread.model.provider === 'llamacpp'
+                    ? thread.model?.id.split(':').slice(0, 2).join(sep())
+                    : thread.model?.id,
               }
             : undefined,
         }