diff --git a/src/components/__tests__/__snapshots__/not-found.test.js.snap b/src/components/__tests__/__snapshots__/not-found.test.js.snap
index b1d03354e..979d52848 100644
--- a/src/components/__tests__/__snapshots__/not-found.test.js.snap
+++ b/src/components/__tests__/__snapshots__/not-found.test.js.snap
@@ -4,7 +4,7 @@ exports[`Renders <NotFound> component 1`] = `
 <div
   className="emoji-mart-no-results"
 >
-  <button
+  <span
     aria-label="🕵️, sleuth_or_spy"
     className="emoji-mart-emoji emoji-mart-emoji-native"
     onClick={[Function]}
@@ -25,7 +25,7 @@ exports[`Renders <NotFound> component 1`] = `
     >
       🕵️
     </span>
-  </button>
+  </span>
   <div
     className="emoji-mart-no-results-label"
   >
diff --git a/src/components/emoji/nimble-emoji.js b/src/components/emoji/nimble-emoji.js
index 13f601722..ddabe1d71 100644
--- a/src/components/emoji/nimble-emoji.js
+++ b/src/components/emoji/nimble-emoji.js
@@ -177,23 +177,36 @@ const NimbleEmoji = (props) => {
     }
   }
 
+  var Tag = {
+    name: 'span',
+    props: {},
+  }
+
+  if (props.onClick) {
+    Tag.name = 'button'
+    Tag.props = {
+      type: 'button',
+    }
+  }
+
   if (props.html) {
     style = _convertStyleToCSS(style)
-    return `<button style='${style}' aria-label='${label}' ${
+    return `<${Tag.name} style='${style}' aria-label='${label}' ${
       title ? `title='${title}'` : ''
-    } class='${className}'>${children || ''}</button>`
+    } class='${className}'>${children || ''}</${Tag.name}>`
   } else {
     return (
-      <button
+      <Tag.name
         onClick={(e) => _handleClick(e, props)}
         onMouseEnter={(e) => _handleOver(e, props)}
         onMouseLeave={(e) => _handleLeave(e, props)}
         aria-label={label}
         title={title}
         className={className}
+        {...Tag.props}
       >
         <span style={style}>{children}</span>
-      </button>
+      </Tag.name>
     )
   }
 }
diff --git a/src/utils/shared-default-props.js b/src/utils/shared-default-props.js
index 489869b58..0517746cb 100644
--- a/src/utils/shared-default-props.js
+++ b/src/utils/shared-default-props.js
@@ -9,9 +9,6 @@ const EmojiDefaultProps = {
   tooltip: false,
   backgroundImageFn: (set, sheetSize) =>
     `https://unpkg.com/emoji-datasource-${set}@${EMOJI_DATASOURCE_VERSION}/img/${set}/sheets-256/${sheetSize}.png`,
-  onOver: () => {},
-  onLeave: () => {},
-  onClick: () => {},
 }
 
 const PickerDefaultProps = {