diff --git a/src/components/category.js b/src/components/category.js
index e16f193..ff5b4f6 100644
--- a/src/components/category.js
+++ b/src/components/category.js
@@ -176,9 +176,7 @@ export default class Category extends React.Component {
     return (
       <div
         ref={this.setContainerRef}
-        className={`emoji-mart-category ${
-          emojis && !emojis.length ? 'emoji-mart-no-results' : ''
-        }`}
+        className="emoji-mart-category"
         style={containerStyles}
       >
         <div
diff --git a/src/components/not-found.js b/src/components/not-found.js
index 3880657..9c51297 100644
--- a/src/components/not-found.js
+++ b/src/components/not-found.js
@@ -6,8 +6,8 @@ export default class NotFound extends React.PureComponent {
   render() {
     const { data, emojiProps, i18n, notFound } = this.props
 
-    const imageComponent = (notFound && notFound()) || (
-      <div>
+    const component = (notFound && notFound()) || (
+      <div className="emoji-mart-no-results">
         {NimbleEmoji({
           data: data,
           ...emojiProps,
@@ -21,7 +21,7 @@ export default class NotFound extends React.PureComponent {
       </div>
     )
 
-    return <div className="emoji-mart-no-results">{imageComponent}</div>
+    return component
   }
 }