diff --git a/src/components/category.js b/src/components/category.js
index 9e3a4d7..31beaa3 100644
--- a/src/components/category.js
+++ b/src/components/category.js
@@ -202,13 +202,12 @@ export default class Category extends React.Component {
         </div>
 
         <ul className="emoji-mart-category-list">
-        {emojis &&
-          emojis.map((emoji) => (
+          {emojis &&
+            emojis.map((emoji) => (
               <li key={emoji.id || emoji}>
                 {NimbleEmoji({ emoji: emoji, data: this.data, ...emojiProps })}
               </li>
-            )
-          )}
+            ))}
         </ul>
 
         {emojis &&
diff --git a/src/components/skins-dot.js b/src/components/skins-dot.js
index 23e31d2..c3e4f5e 100644
--- a/src/components/skins-dot.js
+++ b/src/components/skins-dot.js
@@ -32,17 +32,19 @@ export default class SkinsDot extends Skins {
           className={`emoji-mart-skin-swatch${selected ? ' selected' : ''}`}
           aria-label={i18n.skintones[skinTone]}
           aria-hidden={!visible}
-          {...opened ? { role: 'menuitem' } : {}}
+          {...(opened ? { role: 'menuitem' } : {})}
         >
           <span
             onClick={this.handleClick}
             onKeyDown={this.handleKeyDown}
             role="button"
-            {...selected ? {
-              'aria-haspopup': true,
-              'aria-expanded': !!opened,
-            } : {}}
-            {...opened ? { 'aria-pressed': !!selected } : {}}
+            {...(selected
+              ? {
+                  'aria-haspopup': true,
+                  'aria-expanded': !!opened,
+                }
+              : {})}
+            {...(opened ? { 'aria-pressed': !!selected } : {})}
             tabIndex={visible ? '0' : ''}
             aria-label={i18n.skintones[skinTone]}
             title={i18n.skintones[skinTone]}
@@ -58,7 +60,7 @@ export default class SkinsDot extends Skins {
         className={`emoji-mart-skin-swatches${opened ? ' opened' : ''}`}
         aria-label={i18n.skintext}
       >
-        <div {...opened ? { role: 'menubar' } : {}}>{skinToneNodes}</div>
+        <div {...(opened ? { role: 'menubar' } : {})}>{skinToneNodes}</div>
       </section>
     )
   }