diff --git a/api/src/main.py b/api/src/main.py
index 3f142d9..0409301 100644
--- a/api/src/main.py
+++ b/api/src/main.py
@@ -25,7 +25,7 @@
 )
 from .utils.custom_sources.save_copied_source import CopiedPasteSourceRequest, save_copied_source
 from .utils.custom_sources.save_uploaded_sources import UploadedFiles
-from .utils.generate_audiocast import GenerateAudioCastRequest, generate_audiocast
+from .utils.generate_audiocast import GenerateAudioCastRequest, GenerateAudiocastException, generate_audiocast
 from .utils.generate_audiocast_source import GenerateAudiocastSource, generate_audiocast_source
 from .utils.get_audiocast import get_audiocast
 from .utils.get_session_title import GetSessionTitleModel, get_session_title
@@ -78,6 +78,7 @@ def chat_endpoint(
     db._add_chat(request.chatItem)
 
     def on_finish(text: str):
+        background_tasks.add_task(db._update, {"status": "collating"})
         background_tasks.add_task(
             db._add_chat,
             SessionChatItem(role="assistant", content=text),
@@ -92,6 +93,12 @@ def on_finish(text: str):
     return StreamingResponse(response, media_type="text/event-stream")
 
 
+@app.exception_handler(GenerateAudiocastException)
+async def generate_audiocast_exception_handler(_, exc):
+    SessionManager._update_status(exc.session_id, "failed")
+    return HTTPException(status_code=exc.status_code, detail=str(exc.detail))
+
+
 @app.post("/audiocast/generate", response_model=str)
 async def generate_audiocast_endpoint(
     request: GenerateAudioCastRequest,
diff --git a/api/src/utils/generate_audiocast.py b/api/src/utils/generate_audiocast.py
index 2adfe1e..a1f503d 100644
--- a/api/src/utils/generate_audiocast.py
+++ b/api/src/utils/generate_audiocast.py
@@ -1,16 +1,27 @@
+import asyncio
 import os
 
 from fastapi import BackgroundTasks, HTTPException
 
 from src.services.storage import StorageManager
-from src.utils.audio_manager import AudioManager, AudioManagerConfig
-from src.utils.audiocast_script_maker import AudioScriptMaker
-from src.utils.audiocast_utils import GenerateAudioCastRequest
-from src.utils.chat_utils import ContentCategory
-from src.utils.custom_sources.base_utils import CustomSourceManager
-from src.utils.generate_audiocast_source import GenerateAudiocastSource, generate_audiocast_source
-from src.utils.session_manager import SessionManager
-from src.utils.waveform_utils import WaveformUtils
+
+from .audio_manager import AudioManager, AudioManagerConfig
+from .audiocast_script_maker import AudioScriptMaker
+from .audiocast_utils import GenerateAudioCastRequest
+from .chat_utils import ContentCategory
+from .custom_sources.base_utils import CustomSourceManager
+from .generate_audiocast_source import GenerateAudiocastSource, generate_audiocast_source
+from .session_manager import SessionManager
+from .waveform_utils import WaveformUtils
+
+
+class GenerateAudiocastException(HTTPException):
+    name = "GenerateAudiocastException"
+
+    def __init__(self, detail: str, session_id: str, status_code=500):
+        self.detail = detail
+        self.status_code = status_code
+        self.session_id = session_id
 
 
 def compile_custom_sources(session_id: str):
@@ -44,25 +55,40 @@ def post_generate_audio(
 
 
 async def generate_audiocast(request: GenerateAudioCastRequest, background_tasks: BackgroundTasks):
-    """## Generate audiocast based on a summary of user's request
-
-    ### Steps:
-    1. Generate source content
-    2. Generate audio script
-    3. Generate audio
-    4. a) Store audio. b) Store the audio waveform on GCS
-    5. Update session
-    """
+    """## Generate audiocast based on a summary of user's request"""
     summary = request.summary
     category = request.category
     session_id = request.sessionId
 
     db = SessionManager(session_id, category)
+    session_data = SessionManager.data(session_id)
+
+    if not session_data:
+        raise GenerateAudiocastException(
+            status_code=404, detail=f"Audiocast data not found for session_id: {session_id}", session_id=session_id
+        )
+
+    if session_data.status == "completed":
+        return "Audiocast already generated!"
+    elif session_data.status == "generating":
+        print(f"Queueing the current audio generation request>>>>\n\nSessionId: {session_id}")
+
+        async def retry_generation():
+            await asyncio.sleep(10)
+            try:
+                await generate_audiocast(request, background_tasks)
+            except Exception as e:
+                print(f"Retry failed for session {session_id}: {str(e)}")
+                SessionManager._update_status(session_id, "failed")
+
+        background_tasks.add_task(retry_generation)
+        return "Audiocast generation in progress. Please wait..."
+
+    db._update({"status": "generating"})
 
     def update_session_info(info: str):
         db._update_info(info)
 
-    session_data = SessionManager.data(session_id)
     source_content = session_data.metadata.source if session_data and session_data.metadata else None
 
     if not source_content:
@@ -76,7 +102,9 @@ def update_session_info(info: str):
         )
 
     if not source_content:
-        raise HTTPException(status_code=500, detail="Failed to generate source content")
+        raise GenerateAudiocastException(
+            status_code=500, detail="Failed to generate source content", session_id=session_id
+        )
 
     # get custom sources
     update_session_info("Checking for custom sources...")
@@ -88,7 +116,9 @@ def update_session_info(info: str):
     audio_script = script_maker.create(provider="gemini")
 
     if not audio_script:
-        raise HTTPException(status_code=500, detail="Failed to generate audio script")
+        raise GenerateAudiocastException(
+            status_code=500, detail="Failed to generate audio script", session_id=session_id
+        )
 
     # Generate audio
     update_session_info("Generating audio...")
@@ -102,6 +132,6 @@ def update_session_info(info: str):
         audio_path,
         audio_script,
     )
-    db._update({"completed": True})
+    db._update({"status": "completed"})
 
     return "Audiocast generated successfully!"
diff --git a/api/src/utils/get_audiocast.py b/api/src/utils/get_audiocast.py
index eb5f06a..e69e2cd 100644
--- a/api/src/utils/get_audiocast.py
+++ b/api/src/utils/get_audiocast.py
@@ -28,4 +28,7 @@ def get_audiocast(session_id: str):
             detail=f"Audiocast not found for session_id: {session_id}",
         )
 
+    if session_data.status != "completed":
+        SessionManager._update_status(session_id, "completed")
+
     return session_data.__dict__
diff --git a/api/src/utils/session_manager.py b/api/src/utils/session_manager.py
index 704779e..3a2853f 100644
--- a/api/src/utils/session_manager.py
+++ b/api/src/utils/session_manager.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Callable, Dict, List, Optional, cast
+from typing import Callable, Dict, List, Literal, Optional, cast
 
 from src.services.firestore_sdk import (
     Collection,
@@ -19,6 +19,9 @@ class ChatMetadata:
     title: Optional[str] = None
 
 
+SessionStatus = Literal["collating", "completed", "generating", "failed"]
+
+
 @dataclass
 class SessionModel:
     id: str
@@ -26,7 +29,7 @@ class SessionModel:
     chats: List[SessionChatItem]
     metadata: Optional[ChatMetadata]
     created_at: Optional[str] = None
-    completed: Optional[bool] = None
+    status: Optional[SessionStatus] = None
 
 
 class SessionManager(DBManager):
@@ -150,3 +153,7 @@ def on_snapshot(doc_snapshot, _changes, _read_time):
     @staticmethod
     def _delete_session(doc_id: str):
         return DBManager()._delete_document(collections["audiora_sessions"], doc_id)
+
+    @staticmethod
+    def _update_status(doc_id: str, status: SessionStatus):
+        return DBManager()._update_document(collections["audiora_sessions"], doc_id, data={"status": status})
diff --git a/app/src/lib/components/ChatListActionItems.svelte b/app/src/lib/components/ChatListActionItems.svelte
index e4455ed..a4bf342 100644
--- a/app/src/lib/components/ChatListActionItems.svelte
+++ b/app/src/lib/components/ChatListActionItems.svelte
@@ -16,7 +16,7 @@
 	export let summary: string;
 	export let title: string;
 
-	const { session$, audioSource$, fetchingSource$, sessionId$, sessionCompleted$ } =
+	const { session$, audioSource$, fetchingSource$, sessionId$, sessionCompleted$, updateSessionTitle } =
 		getSessionContext();
 
 	async function ongenerate(summary: string) {
@@ -79,15 +79,9 @@
 
 	async function handleStreamingResponse(res: Response) {
 		if (!res.ok) return;
-
+		
 		for await (const chunk of streamingResponse(res)) {
-			session$.update((session) => {
-				if (session) {
-					if (session.title.toLowerCase() === 'untitled') session.title = '';
-					session.title += chunk;
-				}
-				return session;
-			});
+			updateSessionTitle(chunk);
 		}
 	}
 
diff --git a/app/src/lib/components/Sidebar.svelte b/app/src/lib/components/Sidebar.svelte
index a9c93a7..de7e575 100644
--- a/app/src/lib/components/Sidebar.svelte
+++ b/app/src/lib/components/Sidebar.svelte
@@ -1,4 +1,5 @@
 <script lang="ts" context="module">
+	import { browser } from '$app/environment';
 	import { SESSION_KEY } from '@/stores/sessionContext.svelte';
 
 	const ONE_DAY_MS = 24 * 60 * 60 * 1000;
@@ -6,6 +7,8 @@
 	const last7Days = Date.now() - 4 * ONE_DAY_MS;
 
 	export function getSessionItems() {
+		if (!browser) return [];
+
 		return Object.entries(localStorage)
 			.filter(([key]) => key.startsWith(SESSION_KEY))
 			.map(
@@ -39,17 +42,17 @@
 	import { page } from '$app/stores';
 	import NewAudiocastButton from './NewAudiocastButton.svelte';
 	import { goto } from '$app/navigation';
-	import { browser } from '$app/environment';
 	import { env } from '@env';
 
 	const dispatch = createEventDispatcher<{ clickItem: void }>();
 	const { openSettingsDrawer$ } = getAppContext();
 	const { session$, refreshSidebar$ } = getSessionContext();
 
-	$: sessionItems = browser || $session$ ? getSessionItems() : [];
-	$: sidebarItems = getSidebarItems(sessionItems);
-
-	$: if ($refreshSidebar$) sidebarItems = getSidebarItems(getSessionItems());
+	$: sidebarItems = getSidebarItems(getSessionItems());
+	
+	$: if ($refreshSidebar$ || $session$?.title) {
+		sidebarItems = getSidebarItems(getSessionItems());
+	}
 
 	$: inLast24Hrs = sidebarItems.filter((i) => i.nonce > last24Hrs);
 	$: inLast7Days = sidebarItems.filter((i) => i.nonce < last24Hrs && i.nonce > last7Days);
diff --git a/app/src/lib/stores/sessionContext.svelte.ts b/app/src/lib/stores/sessionContext.svelte.ts
index 21cd590..3f37bed 100644
--- a/app/src/lib/stores/sessionContext.svelte.ts
+++ b/app/src/lib/stores/sessionContext.svelte.ts
@@ -84,6 +84,16 @@ export function setSessionContext(sessionId: string) {
 				session.chats = chats;
 				return session;
 			});
+		},
+		updateSessionTitle: (chunk: string) => {
+			session$.update((session) => {
+				if (session) {
+					if (session.title.toLowerCase() === 'untitled') session.title = '';
+					session.title += chunk;
+				}
+				return session;
+			});
+			return session$;
 		}
 	});
 }
diff --git a/app/src/lib/utils/types.ts b/app/src/lib/utils/types.ts
index af5cd78..5efe00b 100644
--- a/app/src/lib/utils/types.ts
+++ b/app/src/lib/utils/types.ts
@@ -25,7 +25,7 @@ export interface SessionModel {
 	id: string;
 	category: ContentCategory;
 	chats: Array<SessionChatItem>;
-	completed?: boolean;
+	status?: 'collating' | 'completed' | 'generating' | 'failed';
 	metadata?: ChatMetadata;
 	created_at?: string;
 }
diff --git a/app/src/routes/audiocast/[sessionId=sessionId]/+layout.svelte b/app/src/routes/audiocast/[sessionId=sessionId]/+layout.svelte
index fdada26..2cab2bb 100644
--- a/app/src/routes/audiocast/[sessionId=sessionId]/+layout.svelte
+++ b/app/src/routes/audiocast/[sessionId=sessionId]/+layout.svelte
@@ -1,9 +1,10 @@
 <script>
 	import { getSessionContext } from '@/stores/sessionContext.svelte';
 	import { Button } from '@/components/ui/button';
-	const { session$, sessionModel$ } = getSessionContext();
+	const { session$, sessionModel$, customSources$ } = getSessionContext();
 
 	$: $sessionModel$;
+	$: $customSources$;
 </script>
 
 <!-- TODO: Use only the DB references -->
diff --git a/app/src/routes/audiocast/[sessionId=sessionId]/+page.svelte b/app/src/routes/audiocast/[sessionId=sessionId]/+page.svelte
index 6243f80..3115d48 100644
--- a/app/src/routes/audiocast/[sessionId=sessionId]/+page.svelte
+++ b/app/src/routes/audiocast/[sessionId=sessionId]/+page.svelte
@@ -13,8 +13,10 @@
 </script>
 
 <script lang="ts">
+	import { onMount } from 'svelte';
+	import { getAnalytics, logEvent } from 'firebase/analytics';
 	import { getSessionContext } from '@/stores/sessionContext.svelte';
-	import type { ContentCategory, SessionModel } from '@/utils/types';
+	import type { ContentCategory } from '@/utils/types';
 	import { env } from '@env';
 	import { parse } from 'marked';
 	import * as Accordion from '@/components/ui/accordion';
@@ -25,23 +27,23 @@
 	import AudiocastPageSkeletonLoader from '@/components/AudiocastPageSkeletonLoader.svelte';
 	import RenderAudioSources from '@/components/RenderAudioSources.svelte';
 	import AudiocastPageHeader from '@/components/AudiocastPageHeader.svelte';
+	import { toast } from 'svelte-sonner';
 
 	export let data;
 
-	const { customSources$, session$, sessionModel$ } = getSessionContext();
+	const { session$, sessionModel$ } = getSessionContext();
 
 	let generating = false;
 
 	$: sessionId = $page.params.sessionId;
-	$: $customSources$;
-
 	$: sessionModel = $sessionModel$ || data.sessionModel;
+	$: checkAudiocast(sessionId);
+
 	$: sessionTitle = sessionModel.metadata?.title || 'Untitled';
+	$: isGenerating = sessionModel.status === 'generating' || generating;
 
 	async function generateAudiocast(sessionId: string, category: ContentCategory, summary: string) {
-		if (generating) return;
 		generating = true;
-
 		return fetch(`${env.API_BASE_URL}/audiocast/generate`, {
 			method: 'POST',
 			body: JSON.stringify({ sessionId, summary, category }),
@@ -49,21 +51,34 @@
 		})
 			.then<string>((res) => {
 				if (res.ok) return res.json();
-				throw new Error('Failed to generate audiocast');
+				throw new Error(res.statusText);
 			})
-			.finally(() => (generating = false));
+			.then(() => toast.success('Audiocast generated successfully'));
 	}
 
-	async function getAudiocast(sessionId: string): Promise<SessionModel | string | undefined> {
-		return fetch(`${env.API_BASE_URL}/audiocast/${sessionId}`).then<SessionModel>((res) => {
-			if (res.ok) return res.json();
-			else if (res.status === 404 && $session$?.summary) {
-				return generateAudiocast(sessionId, sessionModel.category, $session$.summary);
-			}
+	async function checkAudiocast(sessionId: string) {
+		if (isGenerating || sessionModel.status === 'completed') return;
 
-			throw new Error('Failed to get audiocast');
-		});
+		return fetch(`${env.API_BASE_URL}/audiocast/${sessionId}`)
+			.then((res) => {
+				if (res.ok) return;
+				else if (res.status === 404 && $session$?.summary) {
+					return generateAudiocast(sessionId, sessionModel.category, $session$.summary);
+				}
+				throw new Error(res.statusText);
+			})
+			.catch((error) => {
+				toast.error('Error fetching audiocast:', { description: String(error) });
+			})
+			.finally(() => (generating = false));
 	}
+
+	onMount(() => {
+		logEvent(getAnalytics(), 'page_view', {
+			page_title: 'Audiocast',
+			page_path: `/audiocast/${sessionId}`
+		});
+	});
 </script>
 
 <div
@@ -71,25 +86,7 @@
 >
 	<AudiocastPageHeader category={sessionModel.category} title={sessionModel.metadata?.title} />
 
-	{#await getAudiocast(sessionId)}
-		<div class="flex flex-col w-full">
-			<AudiocastPageSkeletonLoader />
-
-			{#if generating}
-				<div class="flex mt-4 flex-col gap-y-3 w-full items-center">
-					<p class="py-2 px-4 bg-sky-600/20 animate-pulse text-sky-300 rounded-sm">
-						Generating your audiocast...Please wait
-					</p>
-
-					{#if sessionModel?.metadata?.info}
-						<p class="py-2 px-4 animate-pulse text-gray-400 rounded-sm">
-							Status: {sessionModel.metadata.info}
-						</p>
-					{/if}
-				</div>
-			{/if}
-		</div>
-	{:then}
+	{#if sessionModel.status === 'completed'}
 		<div class="flex w-full mt-4 flex-col gap-y-3">
 			<RenderMedia filename={sessionId} let:uri>
 				<audio controls class="w-full animate-fade-in block">
@@ -137,9 +134,25 @@
 				<AudiocastPageChat slot="chats-button" chats={sessionModel.chats} />
 			</AudiocastPageAction>
 		</div>
-	{:catch error}
-		<div>Error: {String(error)}</div>
-	{/await}
+	{:else}
+		<div class="flex flex-col w-full">
+			<AudiocastPageSkeletonLoader />
+
+			{#if isGenerating}
+				<div class="flex mt-4 flex-col gap-y-3 w-full items-center">
+					<p class="py-2 px-4 bg-sky-600/20 animate-pulse text-sky-300 rounded-sm">
+						Generating your audiocast...Please wait
+					</p>
+
+					{#if sessionModel?.metadata?.info}
+						<p class="py-2 px-4 animate-pulse text-gray-400 rounded-sm">
+							Status: {sessionModel.metadata.info}
+						</p>
+					{/if}
+				</div>
+			{/if}
+		</div>
+	{/if}
 </div>
 
 <style lang="postcss">