diff --git a/src/components/Chat.vue b/src/components/Chat.vue
index 45769e2..66441a0 100644
--- a/src/components/Chat.vue
+++ b/src/components/Chat.vue
@@ -313,7 +313,7 @@
     </div>
 
     <MessageOperationsBottomSheet ref="messageOperationsSheet">
-      <!-- <VEmojiPicker ref="emojiPicker" @select="emojiSelected" :i18n="i18nEmoji"/> -->
+      <VEmojiPicker ref="emojiPicker" @select="emojiSelected" :i18n="i18nEmoji"/>
     </MessageOperationsBottomSheet>
 
     <StickerPickerBottomSheet ref="stickerPickerSheet" v-on:selectSticker="sendSticker" />
@@ -398,8 +398,7 @@ import sizeOf from "image-size";
 import dataUriToBuffer from "data-uri-to-buffer";
 import prettyBytes from "pretty-bytes";
 import RoomExport from "./RoomExport.vue";
-
-//import { VEmojiPicker } from 'v-emoji-picker';
+import { VEmojiPicker } from 'v-emoji-picker';
 
 
 const READ_RECEIPT_TIMEOUT = 5000; /* How long a message must have been visible before the read marker is updated */
@@ -454,7 +453,7 @@ export default {
     MessageErrorHandler,
     MessageOperationsChannel,
     RoomExport,
-    //VEmojiPicker
+    VEmojiPicker
   },
 
   data() {
diff --git a/vite.config.mjs b/vite.config.mjs
index bb7d178..4af992f 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -2,10 +2,19 @@ import { defineConfig } from "vite";
 import vue from "@vitejs/plugin-vue2";
 import { fileURLToPath, URL } from "node:url";
 import Components from "unplugin-vue-components/vite";
-import { VuetifyResolver } from "unplugin-vue-components/resolvers";
 import { viteStaticCopy } from 'vite-plugin-static-copy';
 import nodePolyfills from 'rollup-plugin-polyfill-node';
 
+function VuetifyResolver() {
+  return {
+    type: 'component',
+    resolve: (name) => {
+      if (name.match(/^V[A-Z]/) && !name.includes("VEmojiPicker"))
+        return { name, from: 'vuetify/lib' }
+    },
+  }
+}
+
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [