diff --git a/src/components/picker.js b/src/components/picker.js
index 4bdd58770..495c40bd4 100644
--- a/src/components/picker.js
+++ b/src/components/picker.js
@@ -61,6 +61,8 @@ export default class Picker extends React.PureComponent {
       })
 
       allCategories.push(CUSTOM_CATEGORY)
+    } else if (CUSTOM_CATEGORY.emojis.length > 0) {
+      CUSTOM_CATEGORY.emojis = [];
     }
 
     this.hideRecent = true