diff --git a/package.json b/package.json
index 6d04e046..97b94461 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@tauri-apps/api": "1.5.3",
     "dayjs": "^1.11.10",
     "emoji-mart": "^5.5.2",
-    "megalodon": "9.2.0",
+    "megalodon": "9.2.1",
     "next": "^14.1.0",
     "parse-link-header": "^2.0.0",
     "react": "^18.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8e87eee6..fb4ab4ba 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,8 +21,8 @@ dependencies:
     specifier: ^5.5.2
     version: 5.5.2
   megalodon:
-    specifier: 9.2.0
-    version: 9.2.0
+    specifier: 9.2.1
+    version: 9.2.1
   next:
     specifier: ^14.1.0
     version: 14.1.0(@babel/core@7.22.17)(react-dom@18.2.0)(react@18.2.0)(sass@1.70.0)
@@ -3518,8 +3518,8 @@ packages:
       tmpl: 1.0.5
     dev: true
 
-  /megalodon@9.2.0:
-    resolution: {integrity: sha512-zyn4jBIwu1/fdRqt0wKziTQHNfJrjxHd1i3YFD9aN7Kx6GXgk50s02Df/fwJPI0psegX+Q0a1U4DAgbdOE7wSg==}
+  /megalodon@9.2.1:
+    resolution: {integrity: sha512-b+HYdqg6vYcdOs3tlb6XZBmLOP90RXEBy7/4i588ImUvAIXl+H/JmtiukODaZRjllBsml8DpclvNe3bTs8cvLg==}
     engines: {node: '>=15.0.0'}
     dependencies:
       '@badgateway/oauth2-client': 2.3.0
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 5d93fffd..cca33173 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -2290,9 +2290,9 @@ dependencies = [
 
 [[package]]
 name = "megalodon"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa20bbadca546e443526b0c014157f3e0d484cf20ed8fe5d7b3328ee16ec750b"
+checksum = "4f2313f0d1c55db7ee7605fa3db3ac141df191f27ea1e100cd9ed5a5483d332b"
 dependencies = [
  "async-trait",
  "chrono",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index d4084343..1d6c29d0 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -21,7 +21,7 @@ sqlx  = { version = "0.7.3", features = ["runtime-tokio-rustls", "sqlite", "migr
 tokio = { version = "1.35", features = ["full"] }
 futures = "0.3"
 directories = "5.0"
-megalodon = "0.12.0"
+megalodon = "0.12.1"
 open = "5.0"
 log = "0.4"
 reqwest = { version = "0.11", features = ["json", "multipart", "stream"] }
diff --git a/src/components/timelines/status/Actions.tsx b/src/components/timelines/status/Actions.tsx
index 17c776e3..c73e7bf7 100644
--- a/src/components/timelines/status/Actions.tsx
+++ b/src/components/timelines/status/Actions.tsx
@@ -126,7 +126,7 @@ const Actions: React.FC<Props> = props => {
   }
 
   const onEmojiSelect = async emoji => {
-    let name = emoji.shortcodes
+    let name = emoji.name
     if (emoji.native) {
       name = emoji.native
     }
diff --git a/src/components/timelines/status/Status.tsx b/src/components/timelines/status/Status.tsx
index db63b56a..cfb905d1 100644
--- a/src/components/timelines/status/Status.tsx
+++ b/src/components/timelines/status/Status.tsx
@@ -178,7 +178,15 @@ const Status: React.FC<Props> = props => {
               )}
               {status.emoji_reactions &&
                 status.emoji_reactions.map(e => (
-                  <Button appearance="subtle" size="sm" key={e.name} onClick={() => emojiClicked(e)} active={e.me}>
+                  <Button
+                    appearance="subtle"
+                    size="sm"
+                    key={e.name}
+                    onClick={() => emojiClicked(e)}
+                    active={e.me}
+                    disabled={e.name.includes('@')}
+                    title={e.name}
+                  >
                     {e.url ? (
                       <>
                         <img src={e.url} style={{ height: '20px' }} /> <span style={{ marginLeft: '0.2em' }}>{e.count}</span>