diff --git a/frontend/src/app/core/auth/auth.interceptor.ts b/frontend/src/app/core/auth/auth.interceptor.ts
index 37dfcfa8..636e965b 100644
--- a/frontend/src/app/core/auth/auth.interceptor.ts
+++ b/frontend/src/app/core/auth/auth.interceptor.ts
@@ -33,7 +33,7 @@ export const authInterceptor = (
             });
         }
     } else {
-        // For IAP, do not modify the request headers
+        // For IAP, do not modify the request headers, the token is sent as a cookie.
         newReq = req.clone();
     }
 
@@ -43,8 +43,8 @@ export const authInterceptor = (
             // Handle "401 Unauthorized" responses
             if (error instanceof HttpErrorResponse && error.status === 401) {
                 if (environment.auth === 'google_iap') {
-                    // Redirect to root to trigger IAP authentication
-                    window.location.href = '/';
+                    // Refresh to trigger IAP authentication
+                    window.location.reload();
                     return throwError(() => new Error('Redirecting to IAP authentication'));
                 } else {
                     // Sign out and reload the app for other auth modes
diff --git a/frontend/src/app/modules/admin/apps/chat/chat.service.ts b/frontend/src/app/modules/admin/apps/chat/chat.service.ts
index ebdc0019..7e678e76 100644
--- a/frontend/src/app/modules/admin/apps/chat/chat.service.ts
+++ b/frontend/src/app/modules/admin/apps/chat/chat.service.ts
@@ -194,7 +194,7 @@ export class ChatService {
      * Reset the selected chat
      */
     resetChat(): void {
-        this._chat.next({ id: '', messages: [], title: '', updatedAt: Date.now() });
+        this._chat.next(null);
     }
 
 
diff --git a/frontend/src/app/modules/admin/apps/chat/conversation/conversation.component.html b/frontend/src/app/modules/admin/apps/chat/conversation/conversation.component.html
index 13a1042a..0cd92d8b 100644
--- a/frontend/src/app/modules/admin/apps/chat/conversation/conversation.component.html
+++ b/frontend/src/app/modules/admin/apps/chat/conversation/conversation.component.html
@@ -26,16 +26,18 @@
                     class="flex h-18 flex-0 items-center border-b bg-gray-50 px-4 dark:bg-transparent md:px-6"
                 >
                     <!-- Back button -->
-                    <a
-                        class="md:-ml-2 lg:hidden"
-                        mat-icon-button
-                        [routerLink]="['./']"
-                        (click)="resetChat()"
-                    >
-                        <mat-icon
-                            [svgIcon]="'heroicons_outline:arrow-long-left'"
-                        ></mat-icon>
-                    </a>
+                    @if (chats.length) {
+                        <a
+                                class="md:-ml-2 lg:hidden"
+                                mat-icon-button
+                                [routerLink]="['./']"
+                                (click)="goBack()"
+                        >
+                            <mat-icon
+                                    [svgIcon]="'heroicons_outline:arrow-long-left'"
+                            ></mat-icon>
+                        </a>
+                    }
 
                     <button
                         class="ml-auto"
diff --git a/frontend/src/app/modules/admin/apps/chat/conversation/conversation.component.ts b/frontend/src/app/modules/admin/apps/chat/conversation/conversation.component.ts
index f39efe2e..31ddf31c 100644
--- a/frontend/src/app/modules/admin/apps/chat/conversation/conversation.component.ts
+++ b/frontend/src/app/modules/admin/apps/chat/conversation/conversation.component.ts
@@ -38,7 +38,6 @@ import {MatSelect} from "@angular/material/select";
 import {ReactiveFormsModule} from "@angular/forms";
 import {MatTooltipModule} from "@angular/material/tooltip";
 
-
 @Component({
     selector: 'chat-conversation',
     templateUrl: './conversation.component.html',
@@ -85,6 +84,7 @@ export class ConversationComponent implements OnInit, OnDestroy, AfterViewInit {
     @ViewChild('messageInput') messageInput: ElementRef;
     @ViewChild('llmSelect') llmSelect: MatSelect;
     chat: Chat;
+    chats: Chat[];
     drawerMode: 'over' | 'side' = 'side';
     drawerOpened: boolean = false;
     private _unsubscribeAll: Subject<any> = new Subject<any>();
@@ -161,7 +161,7 @@ export class ConversationComponent implements OnInit, OnDestroy, AfterViewInit {
 
                 if (chatId === 'new' || !chatId) {
                     // If 'new' or no ID, reset the chat
-                    this.resetChat();
+                    this.goBack();
                 }
             });
 
@@ -176,14 +176,12 @@ export class ConversationComponent implements OnInit, OnDestroy, AfterViewInit {
                     return;
                 }
                 this.chat = clone(chat) || { id: '', messages: [], title: '', updatedAt: Date.now() };
-                console.log('this._chatService.chat$.subscribe')
-                console.log(chat);
+
                 if(chat.messages.length > 0) {
                     // Set the LLM selector as the LLM used to send the last message
                     const lastMessageLlmId = chat.messages.at(-1).llmId
                     if (lastMessageLlmId) { // TODO check the llmId is in the $llm list
                         this.llmId = lastMessageLlmId;
-                        console.log(`last message llm ${this.llmId}`)
                     } else {
                         // TODO default to user profile default chat LLM
                     }
@@ -191,6 +189,13 @@ export class ConversationComponent implements OnInit, OnDestroy, AfterViewInit {
                 this._changeDetectorRef.markForCheck();
             });
 
+        // Chats observable
+        this._chatService.chats$
+            .pipe(takeUntil(this._unsubscribeAll))
+            .subscribe((chats: Chat[]) => {
+                this.chats = chats;
+            });
+
         // Media watcher (unchanged)
         this._fuseMediaWatcherService.onMediaChange$
             .pipe(takeUntil(this._unsubscribeAll))
@@ -232,23 +237,9 @@ export class ConversationComponent implements OnInit, OnDestroy, AfterViewInit {
     /**
      * Reset the chat
      */
-    resetChat(): void {
-        this.chat = { id: '', messages: [], title: '', updatedAt: Date.now() };
+    goBack(): void {
         this._chatService.resetChat();
-        this.generating = false
-
-        // TODO set LLM field to the user profile default chat LLM
-
-        // Close the contact info in case it's opened
-        this.drawerOpened = false;
-
-        // Clear the input field
-        if (this.messageInput) {
-            this.messageInput.nativeElement.value = '';
-        }
-
-        // Mark for check
-        this._changeDetectorRef.markForCheck();
+        this.router.navigate(['/ui/apps/chat']).catch(console.error);
     }
 
     /**
@@ -257,8 +248,7 @@ export class ConversationComponent implements OnInit, OnDestroy, AfterViewInit {
     deleteChat(): void {
         if (this.chat && this.chat.id) {
             this._chatService.deleteChat(this.chat.id).subscribe(() => {
-                this.resetChat();
-                this.router.navigate(['/ui/apps/chat']).catch(console.error);
+                this.goBack();
             });
         }
     }
@@ -301,8 +291,7 @@ export class ConversationComponent implements OnInit, OnDestroy, AfterViewInit {
         this.messageInput.nativeElement.value = '';
 
         // If this is a new chat, then redirect to the created chat
-        if (!this.chat.id) {
-
+        if (!this.chat.id || this.chat.id === 'new') {
             this._changeDetectorRef.markForCheck();
             // TODO handle error, set the message back to the messageInput and remove from chat.messages
             this._chatService.createChat(message, this.llmId).subscribe(async (chat: Chat) => {