diff --git a/src/pages/settings/Profile/CustomStatus/StatusPage.js b/src/pages/settings/Profile/CustomStatus/StatusPage.js
index 7ca13b96ea08..8d649af68001 100644
--- a/src/pages/settings/Profile/CustomStatus/StatusPage.js
+++ b/src/pages/settings/Profile/CustomStatus/StatusPage.js
@@ -81,7 +81,7 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
             }
             User.updateCustomStatus({
                 text: statusText,
-                emojiCode: emojiCode || initialEmoji,
+                emojiCode: !emojiCode && statusText ? initialEmoji : emojiCode,
                 clearAfter: clearAfterTime !== CONST.CUSTOM_STATUS_TYPES.NEVER ? clearAfterTime : '',
             });