diff --git a/CHANGES.md b/CHANGES.md
index 74cd33f54..faafe2c33 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,7 @@
 ## 8.0.0 (Unreleased)
 
 - #1083: Add support for XEP-0393 Message Styling
+- Bugfix: `null` inserted by emoji picker and can't switch between skintones
 - New configuration setting: [show_tab_notifications](https://conversejs.org/docs/html/configuration.html#show-tab-notifications)
 
 ### Breaking Changes
diff --git a/src/headless/converse-emoji.js b/src/headless/converse-emoji.js
index af1fdf5f5..cda48b399 100644
--- a/src/headless/converse-emoji.js
+++ b/src/headless/converse-emoji.js
@@ -126,6 +126,7 @@ export function getEmojiMarkup (data, options={unicode_only: false, add_title_wr
                 const path = api.settings.get('emoji_image_path');
                 return html`<img class="emoji"
                     draggable="false"
+                    title="${shortname}"
                     alt="${emoji}"
                     src="${path}/72x72/${data.cp}.png"/>`;
             }