diff --git a/src/components/category.js b/src/components/category.js
index bb91a07..6d341a9 100644
--- a/src/components/category.js
+++ b/src/components/category.js
@@ -138,7 +138,7 @@ export default class Category extends React.Component {
 
       {emojis && emojis.map((emoji) =>
         <Emoji
-          key={emoji}
+          key={emoji.short_name || emoji}
           emoji={emoji}
           {...emojiProps}
         />
diff --git a/src/components/emoji.js b/src/components/emoji.js
index 8955ed9..ed227fc 100644
--- a/src/components/emoji.js
+++ b/src/components/emoji.js
@@ -32,7 +32,7 @@ export default class Emoji extends React.Component {
     }
 
     if (this.hasSkinVariations && skin > 1) {
-      emojiData = JSON.parse(JSON.stringify(data.emojis[emoji]))
+      emojiData = JSON.parse(JSON.stringify(emojiData))
 
       var skinKey = SKINS[skin - 1],
           variationKey = `${emojiData.unified}-${skinKey}`,