diff --git a/app/gabsocial/components/emoji_selector.js b/app/gabsocial/components/emoji_selector.js
index fabc276dd..e86775d4b 100644
--- a/app/gabsocial/components/emoji_selector.js
+++ b/app/gabsocial/components/emoji_selector.js
@@ -5,17 +5,22 @@ import emojify from 'gabsocial/features/emoji/emoji';
 
 export default class EmojiSelector extends React.Component {
 
-  propTypes = {
+  static propTypes = {
     onReact: PropTypes.func.isRequired,
   }
 
+  static defaultProps = {
+    onReact: () => {},
+  }
+
   render() {
     const { onReact } = this.props;
 
     return (
       <div className='emoji-react-selector'>
-        {ALLOWED_EMOJI.map(emoji => (
+        {ALLOWED_EMOJI.map((emoji, i) => (
           <button
+            key={i}
             className='emoji-react-selector__emoji'
             dangerouslySetInnerHTML={{ __html: emojify(emoji) }}
             onClick={onReact(emoji)}
diff --git a/app/gabsocial/features/status/components/status_interaction_bar.js b/app/gabsocial/features/status/components/status_interaction_bar.js
index ac674b07c..4e4a7fd54 100644
--- a/app/gabsocial/features/status/components/status_interaction_bar.js
+++ b/app/gabsocial/features/status/components/status_interaction_bar.js
@@ -5,7 +5,7 @@ import { reduceEmoji } from 'gabsocial/utils/emoji_reacts';
 
 export class StatusInteractionBar extends React.Component {
 
-  propTypes = {
+  static propTypes = {
     status: ImmutablePropTypes.map,
   }