diff --git a/src/components/category.js b/src/components/category.js
index 71f6c0e..4368c11 100644
--- a/src/components/category.js
+++ b/src/components/category.js
@@ -198,7 +198,7 @@ export default class Category extends React.Component {
         <ul className="emoji-mart-category-list">
         {emojis &&
           emojis.map((emoji) => (
-              <li>
+              <li key={emoji.id || emoji}>
                 {NimbleEmoji({ emoji: emoji, data: this.data, ...emojiProps })}
               </li>
             )
diff --git a/src/components/emoji/nimble-emoji.js b/src/components/emoji/nimble-emoji.js
index 23ad4cd..13f6017 100644
--- a/src/components/emoji/nimble-emoji.js
+++ b/src/components/emoji/nimble-emoji.js
@@ -185,7 +185,6 @@ const NimbleEmoji = (props) => {
   } else {
     return (
       <button
-        key={props.emoji.id || props.emoji}
         onClick={(e) => _handleClick(e, props)}
         onMouseEnter={(e) => _handleOver(e, props)}
         onMouseLeave={(e) => _handleLeave(e, props)}