diff --git a/apps/client/src/features/editor/components/callout/callout-menu.tsx b/apps/client/src/features/editor/components/callout/callout-menu.tsx
index 400460e7..988f214a 100644
--- a/apps/client/src/features/editor/components/callout/callout-menu.tsx
+++ b/apps/client/src/features/editor/components/callout/callout-menu.tsx
@@ -23,7 +23,7 @@ import EmojiPicker from "@/components/ui/emoji-picker.tsx";
 
 export function CalloutMenu({ editor }: EditorMenuProps) {
   const { t } = useTranslation();
-  
+
   const shouldShow = useCallback(
     ({ state }: ShouldShowProps) => {
       if (!state) {
@@ -164,19 +164,17 @@ export function CalloutMenu({ editor }: EditorMenuProps) {
           </ActionIcon>
         </Tooltip>
 
-        <Tooltip position="top" label={t("Custom emoji")}>
-          <EmojiPicker
-            onEmojiSelect={setCalloutIcon}
-            removeEmojiAction={removeCalloutIcon}
-            readOnly={false}
-            icon={currentIcon || <IconMoodSmile size={18} />}
-            actionIconProps={{
-              size: "lg",
-              variant: "default",
-              c: undefined
-            }}
-          />
-        </Tooltip>
+        <EmojiPicker
+          onEmojiSelect={setCalloutIcon}
+          removeEmojiAction={removeCalloutIcon}
+          readOnly={false}
+          icon={currentIcon || <IconMoodSmile size={18} />}
+          actionIconProps={{
+            size: "lg",
+            variant: "default",
+            c: undefined,
+          }}
+        />
       </ActionIcon.Group>
     </BaseBubbleMenu>
   );
diff --git a/apps/server/src/ee b/apps/server/src/ee
index aa33dcd2..38de2d0d 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit aa33dcd2ba310705d6799d1e468390774e0cf3e7
+Subproject commit 38de2d0dc1ae233668cf546f3ab74046afa8986a