diff --git a/src/lib/components/chat/Placeholder/FolderTitle.svelte b/src/lib/components/chat/Placeholder/FolderTitle.svelte
index 24e289521..d2546f595 100644
--- a/src/lib/components/chat/Placeholder/FolderTitle.svelte
+++ b/src/lib/components/chat/Placeholder/FolderTitle.svelte
@@ -76,7 +76,7 @@
 	const updateIconHandler = async (iconName) => {
 		const res = await updateFolderById(localStorage.token, folder.id, {
 			meta: {
-				icon: iconName
+				icon: iconName ?? ''
 			}
 		}).catch((error) => {
 			toast.error(`${error}`);
@@ -84,7 +84,7 @@
 		});
 
 		if (res) {
-			folder.meta = { ...folder.meta, icon: iconName };
+			folder.meta = { ...folder.meta, icon: iconName ?? '' };
 
 			toast.success($i18n.t('Folder updated successfully'));
 
@@ -167,6 +167,7 @@
 		<div class="text-center flex gap-3.5 items-center">
 			<EmojiPicker
 				onClose={() => {}}
+				selected={folder?.meta?.icon ?? null}
 				onSubmit={(name) => {
 					console.log(name);
 					updateIconHandler(name);
diff --git a/src/lib/components/common/EmojiPicker.svelte b/src/lib/components/common/EmojiPicker.svelte
index 624bb7be1..84233845c 100644
--- a/src/lib/components/common/EmojiPicker.svelte
+++ b/src/lib/components/common/EmojiPicker.svelte
@@ -19,6 +19,7 @@
 	export let side = 'top';
 	export let align = 'start';
 	export let user = null;
+	export let selected = null;
 
 	let show = false;
 	let emojis = emojiShortCodes;
@@ -97,7 +98,11 @@
 	// Handle emoji selection
 	function selectEmoji(emoji) {
 		const selectedCode = emoji.shortCodes[0];
-		onSubmit(selectedCode);
+		if (selected === selectedCode) {
+			onSubmit(null);
+		} else {
+			onSubmit(selectedCode);
+		}
 		show = false;
 	}
 </script>
@@ -131,6 +136,8 @@
 				bind:value={search}
 			/>
 		</div>
+
+
 		<!-- Virtualized Emoji List -->
 		<div class="w-full flex justify-start h-96 overflow-y-auto px-3 pb-3 text-sm">
 			{#if emojiRows.length === 0}
@@ -155,7 +162,7 @@
 											placement="top"
 										>
 											<button
-												class="p-1.5 rounded-lg cursor-pointer hover:bg-gray-200 dark:hover:bg-gray-700 transition"
+												class="p-1.5 rounded-lg cursor-pointer hover:bg-gray-200 dark:hover:bg-gray-700 transition {selected === emojiItem.shortCodes[0] ? 'bg-gray-200 dark:bg-gray-700' : ''}"
 												on:click={() => selectEmoji(emojiItem)}
 											>
 												<img