diff --git a/components/book/BookList.tsx b/components/book/BookList.tsx
index 382b9e2..68ccd0c 100644
--- a/components/book/BookList.tsx
+++ b/components/book/BookList.tsx
@@ -253,8 +253,8 @@ export default function BookList() {
                                     <div
                                         className="flex justify-between items-center w-full max-w-5xl mx-auto mb-6 px-6">
                                         <h2 className="text-3xl text-text-primary capitalize font-['ADLaM_Display'] flex items-center gap-3">
-                                            <span key="icon" className="w-1 h-8 bg-primary rounded-full"></span>
-                                            <span key="title">{category}</span>
+                                            <span className="w-1 h-8 bg-primary rounded-full"></span>
+                                            <span>{category}</span>
                                         </h2>
                                         <span
                                             className="text-muted text-lg font-medium bg-secondary/30 px-4 py-1.5 rounded-full">{books.length} {t("bookList.works")}</span>
@@ -263,7 +263,7 @@ export default function BookList() {
                                     <div className="flex flex-wrap justify-center items-start w-full px-4">
                                         {
                                             books.map((book: BookProps, idx) => (
-                                                <div key={book.bookId}
+                                                <div key={book.bookId || `book-${idx}`}
                                                      {...(idx === 0 && {'data-guide': 'book-card'})}
                                                      className={`w-full sm:w-1/3 md:w-1/4 lg:w-1/5 xl:w-1/6 p-2 box-border ${User.guideTourDone(session.user?.guideTour || [], 'new-first-book') && 'mb-[200px]'}`}>
                                                     <BookCard book={book}
diff --git a/components/book/settings/story/MainChapter.tsx b/components/book/settings/story/MainChapter.tsx
index 927feb1..4a18f4f 100644
--- a/components/book/settings/story/MainChapter.tsx
+++ b/components/book/settings/story/MainChapter.tsx
@@ -12,6 +12,7 @@ import AlertBox from "@/components/AlertBox";
 import CollapsableArea from "@/components/CollapsableArea";
 import {useTranslations} from "next-intl";
 import {LangContext} from "@/context/LangContext";
+import OfflineContext, {OfflineContextType} from "@/context/OfflineContext";
 
 interface MainChapterProps {
     chapters: ChapterListProps[];
@@ -21,6 +22,7 @@ interface MainChapterProps {
 export default function MainChapter({chapters, setChapters}: MainChapterProps) {
     const t = useTranslations();
     const {lang} = useContext(LangContext)
+    const {isCurrentlyOffline} = useContext<OfflineContextType>(OfflineContext);
     const {book} = useContext(BookContext);
     const {session} = useContext(SessionContext);
     const {errorMessage, successMessage} = useContext(AlertContext);
@@ -78,15 +80,16 @@ export default function MainChapter({chapters, setChapters}: MainChapterProps) {
     async function deleteChapter(): Promise<void> {
         try {
             setDeleteConfirmMessage(false);
-            const response: boolean = await System.authDeleteToServer<boolean>(
-                'chapter/remove',
-                {
-                    bookId,
-                    chapterId: chapterIdToRemove,
-                },
-                token,
-                lang,
-            );
+            let response: boolean;
+            const deleteData = {
+                bookId,
+                chapterId: chapterIdToRemove,
+            };
+            if (isCurrentlyOffline()) {
+                response = await window.electron.invoke<boolean>('db:chapter:remove', deleteData);
+            } else {
+                response = await System.authDeleteToServer<boolean>('chapter/remove', deleteData, token, lang);
+            }
             if (!response) {
                 errorMessage(t("mainChapter.errorDelete"));
             }
@@ -105,18 +108,20 @@ export default function MainChapter({chapters, setChapters}: MainChapterProps) {
         if (newChapterTitle.trim() === '') {
             return;
         }
-        
+
         try {
-            const responseId: string = await System.authPostToServer<string>(
-                'chapter/add',
-                {
-                    bookId: bookId,
-                    wordsCount: 0,
-                    chapterOrder: newChapterOrder ? newChapterOrder : 0,
-                    title: newChapterTitle,
-                },
-                token,
-            );
+            let responseId: string;
+            const chapterData = {
+                bookId: bookId,
+                wordsCount: 0,
+                chapterOrder: newChapterOrder ? newChapterOrder : 0,
+                title: newChapterTitle,
+            };
+            if (isCurrentlyOffline()) {
+                responseId = await window.electron.invoke<string>('db:chapter:add', chapterData);
+            } else {
+                responseId = await System.authPostToServer<string>('chapter/add', chapterData, token);
+            }
             if (!responseId) {
                 errorMessage(t("mainChapter.errorAdd"));
                 return;
@@ -130,7 +135,7 @@ export default function MainChapter({chapters, setChapters}: MainChapterProps) {
             };
             setChapters([...chapters, newChapter]);
             setNewChapterTitle('');
-            
+
             setNewChapterOrder(newChapterOrder + 1);
         } catch (e: unknown) {
             if (e instanceof Error) {
diff --git a/electron/ipc/book.ipc.ts b/electron/ipc/book.ipc.ts
index c39e133..baa984d 100644
--- a/electron/ipc/book.ipc.ts
+++ b/electron/ipc/book.ipc.ts
@@ -2,6 +2,7 @@ import { ipcMain } from 'electron';
 import { createHandler } from '../database/LocalSystem.js';
 import Book from '../database/models/Book.js';
 import type { BookProps, GuideLine, GuideLineAI, Act, Issue, WorldProps } from '../database/models/Book.js';
+import Chapter from '../database/models/Chapter.js';
 import type { ChapterProps } from '../database/models/Chapter.js';
 
 interface UpdateBookBasicData {
@@ -30,6 +31,7 @@ interface UpdateGuideLineData {
 interface StoryData {
     acts: Act[];
     issues: Issue[];
+    mainChapter: ChapterProps[];
 }
 
 interface UpdateStoryData {
@@ -144,7 +146,7 @@ ipcMain.handle('db:book:guideline:update', createHandler<UpdateGuideLineData, bo
     )
 );
 
-// GET /book/story - Get story data (acts + issues)
+// GET /book/story - Get story data (acts + issues + mainChapter)
 interface GetStoryData {
     bookid: string;
 }
@@ -152,9 +154,11 @@ ipcMain.handle('db:book:story:get', createHandler<GetStoryData, StoryData>(
         async function(userId: string, data: GetStoryData, lang: 'fr' | 'en'):Promise<StoryData> {
             const acts:Act[] = await Book.getActsData(userId, data.bookid, lang);
             const issues:Issue[] = await Book.getIssuesFromBook(userId, data.bookid, lang);
+            const mainChapter:ChapterProps[] = Chapter.getAllChaptersFromABook(userId, data.bookid, lang);
             return {
                 acts,
-                issues
+                issues,
+                mainChapter
             };
         }
     )
diff --git a/electron/ipc/chapter.ipc.ts b/electron/ipc/chapter.ipc.ts
index 91d27f6..9e3589f 100644
--- a/electron/ipc/chapter.ipc.ts
+++ b/electron/ipc/chapter.ipc.ts
@@ -115,10 +115,13 @@ ipcMain.handle('db:chapter:add', createHandler<AddChapterData, string>(
 );
 
 // DELETE /chapter/remove - Remove chapter
-ipcMain.handle('db:chapter:remove', createHandler<string, boolean>(
-        function(userId: string, chapterId: string, lang: 'fr' | 'en'): boolean {
-            console.log(userId,chapterId,lang)
-            return Chapter.removeChapter(userId, chapterId, lang);
+interface RemoveChapterData {
+    chapterId: string;
+    bookId?: string;
+}
+ipcMain.handle('db:chapter:remove', createHandler<RemoveChapterData, boolean>(
+        function(userId: string, data: RemoveChapterData, lang: 'fr' | 'en'): boolean {
+            return Chapter.removeChapter(userId, data.chapterId, lang);
         }
     )
 );