diff --git a/package-lock.json b/package-lock.json
index f8c888add0e..c43250f3e9a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,6 @@
         "@nextcloud/vue": "^8.11.3",
         "crypto-js": "^4.2.0",
         "debounce": "^2.0.0",
-        "emoji-mart-vue-fast": "^15.0.2",
         "emoji-regex": "^10.3.0",
         "escape-html": "^1.0.3",
         "extendable-media-recorder": "^9.1.15",
diff --git a/package.json b/package.json
index 1cd218f2afb..7f01a346687 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,6 @@
     "@nextcloud/vue": "^8.11.3",
     "crypto-js": "^4.2.0",
     "debounce": "^2.0.0",
-    "emoji-mart-vue-fast": "^15.0.2",
     "emoji-regex": "^10.3.0",
     "escape-html": "^1.0.3",
     "extendable-media-recorder": "^9.1.15",
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index e05fdf67583..be45655b294 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -264,9 +264,6 @@
 </template>
 
 <script>
-import { frequently, EmojiIndex as EmojiIndexFactory } from 'emoji-mart-vue-fast'
-import data from 'emoji-mart-vue-fast/data/all.json'
-
 import AccountIcon from 'vue-material-design-icons/Account.vue'
 import AlarmIcon from 'vue-material-design-icons/Alarm.vue'
 import ArrowLeft from 'vue-material-design-icons/ArrowLeft.vue'
@@ -301,6 +298,7 @@ import NcActionSeparator from '@nextcloud/vue/dist/Components/NcActionSeparator.
 import NcActionText from '@nextcloud/vue/dist/Components/NcActionText.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
+import { emojiSearch } from '@nextcloud/vue/dist/Functions/emoji.js'
 
 import { PARTICIPANT, CONVERSATION, ATTENDEE } from '../../../../../constants.js'
 import { getMessageReminder, removeMessageReminder, setMessageReminder } from '../../../../../services/remindersService.js'
@@ -309,7 +307,6 @@ import { useReactionsStore } from '../../../../../stores/reactions.js'
 import { copyConversationLinkToClipboard } from '../../../../../utils/handleUrl.ts'
 import { parseMentions } from '../../../../../utils/textParse.ts'
 
-const EmojiIndex = new EmojiIndexFactory(data)
 const supportReminders = getCapabilities()?.spreed?.features?.includes('remind-me-later')
 const canEditMessage = getCapabilities()?.spreed?.features?.includes('edit-messages')
 const canDeleteMessageUnlimited = getCapabilities()?.spreed?.features?.includes('delete-messages-unlimited')
@@ -812,9 +809,7 @@ export default {
 		},
 
 		updateFrequentlyUsedEmojis() {
-			this.frequentlyUsedEmojis = frequently.get(5).map(emojiStrings => {
-				return EmojiIndex.emoji(emojiStrings).native
-			})
+			this.frequentlyUsedEmojis = emojiSearch('', 5).map(emoji => emoji.native)
 		},
 
 		getTimestamp(momentObject) {