diff --git a/src/components/category.js b/src/components/category.js
index 457bc7a..672af32 100644
--- a/src/components/category.js
+++ b/src/components/category.js
@@ -16,9 +16,9 @@ export default class Category extends React.Component {
   }
 
   shouldComponentUpdate(nextProps, nextState) {
-    var { name, perLine, hasStickyPosition, emojis, emojiProps } = this.props,
+    var { name, perLine, native, hasStickyPosition, emojis, emojiProps } = this.props,
         { skin, size, set } = emojiProps,
-        { perLine: nextPerLine, hasStickyPosition: nextHasStickyPosition, emojis: nextEmojis, emojiProps: nextEmojiProps } = nextProps,
+        { perLine: nextPerLine, native: nextNative, hasStickyPosition: nextHasStickyPosition, emojis: nextEmojis, emojiProps: nextEmojiProps } = nextProps,
         { skin: nextSkin, size: nextSize, set: nextSet } = nextEmojiProps,
         shouldUpdate = false
 
@@ -30,7 +30,7 @@ export default class Category extends React.Component {
       shouldUpdate = !(emojis == nextEmojis)
     }
 
-    if (skin != nextSkin || size != nextSize || set != nextSet || hasStickyPosition != nextHasStickyPosition) {
+    if (skin != nextSkin || size != nextSize || native != nextNative || set != nextSet || hasStickyPosition != nextHasStickyPosition) {
       shouldUpdate = true
     }
 
@@ -152,6 +152,7 @@ Category.propTypes = {
   emojis: React.PropTypes.array,
   hasStickyPosition: React.PropTypes.bool,
   name: React.PropTypes.string.isRequired,
+  native: React.PropTypes.bool.isRequired,
   perLine: React.PropTypes.number.isRequired,
   emojiProps: React.PropTypes.object.isRequired,
 }
diff --git a/src/components/emoji.js b/src/components/emoji.js
index 5419059..ae1ab25 100644
--- a/src/components/emoji.js
+++ b/src/components/emoji.js
@@ -16,6 +16,7 @@ export default class Emoji extends React.Component {
     return (
       this.hasSkinVariations && nextProps.skin != this.props.skin ||
       nextProps.size != this.props.size ||
+      nextProps.native != this.props.native ||
       nextProps.set != this.props.set ||
       nextProps.emoji != this.props.emoji
     )
diff --git a/src/components/picker.js b/src/components/picker.js
index 0993ac6..c878483 100644
--- a/src/components/picker.js
+++ b/src/components/picker.js
@@ -291,6 +291,7 @@ export default class Picker extends React.Component {
             name={category.name}
             emojis={category.emojis}
             perLine={perLine}
+            native={native}
             hasStickyPosition={this.hasStickyPosition}
             i18n={this.i18n}
             emojiProps={{