diff --git a/backend/apps/web/models/tags.py b/backend/apps/web/models/tags.py
index ef21ca08c..5c6c094e8 100644
--- a/backend/apps/web/models/tags.py
+++ b/backend/apps/web/models/tags.py
@@ -101,7 +101,6 @@ class TagTable:
         if tag == None:
             tag = self.insert_new_tag(form_data.tag_name, user_id)
 
-        print(tag)
         id = str(uuid.uuid4())
         chatIdTag = ChatIdTagModel(
             **{
@@ -131,7 +130,6 @@ class TagTable:
             .order_by(ChatIdTag.timestamp.desc())
         ]
 
-        print(tag_names)
         return [
             TagModel(**model_to_dict(tag))
             for tag in Tag.select().where(Tag.name.in_(tag_names))
diff --git a/backend/apps/web/routers/chats.py b/backend/apps/web/routers/chats.py
index 38685826f..c4d9ebab4 100644
--- a/backend/apps/web/routers/chats.py
+++ b/backend/apps/web/routers/chats.py
@@ -134,7 +134,6 @@ async def get_chat_tags_by_id(id: str, user=Depends(get_current_user)):
     tags = Tags.get_tags_by_chat_id_and_user_id(id, user.id)
 
     if tags != None:
-        print(tags)
         return tags
     else:
         raise HTTPException(
diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
index 66e8bc624..29e4f2018 100644
--- a/src/routes/(app)/+page.svelte
+++ b/src/routes/(app)/+page.svelte
@@ -189,6 +189,7 @@
 						},
 						messages: messages,
 						history: history,
+						tags: [],
 						timestamp: Date.now()
 					});
 					await chats.set(await getChatList(localStorage.token));
@@ -690,11 +691,19 @@
 	const addTag = async (tagName) => {
 		const res = await addTagById(localStorage.token, $chatId, tagName);
 		tags = await getTags();
+
+		chat = await updateChatById(localStorage.token, $chatId, {
+			tags: tags
+		});
 	};
 
 	const deleteTag = async (tagName) => {
 		const res = await deleteTagById(localStorage.token, $chatId, tagName);
 		tags = await getTags();
+
+		chat = await updateChatById(localStorage.token, $chatId, {
+			tags: tags
+		});
 	};
 
 	const setChatTitle = async (_chatId, _title) => {
diff --git a/src/routes/(app)/c/[id]/+page.svelte b/src/routes/(app)/c/[id]/+page.svelte
index 481dc9965..37f6f39c4 100644
--- a/src/routes/(app)/c/[id]/+page.svelte
+++ b/src/routes/(app)/c/[id]/+page.svelte
@@ -707,11 +707,19 @@
 	const addTag = async (tagName) => {
 		const res = await addTagById(localStorage.token, $chatId, tagName);
 		tags = await getTags();
+
+		chat = await updateChatById(localStorage.token, $chatId, {
+			tags: tags.map((tag) => tag.name)
+		});
 	};
 
 	const deleteTag = async (tagName) => {
 		const res = await deleteTagById(localStorage.token, $chatId, tagName);
 		tags = await getTags();
+
+		chat = await updateChatById(localStorage.token, $chatId, {
+			tags: tags.map((tag) => tag.name)
+		});
 	};
 
 	onMount(async () => {