diff --git a/src/components/EmojiPicker/EmojiPickerButtonDropdown.js b/src/components/EmojiPicker/EmojiPickerButtonDropdown.js
index bfcb66aeefbb..7f60b0615785 100644
--- a/src/components/EmojiPicker/EmojiPickerButtonDropdown.js
+++ b/src/components/EmojiPicker/EmojiPickerButtonDropdown.js
@@ -60,7 +60,12 @@ function EmojiPickerButtonDropdown(props) {
                             style={styles.emojiPickerButtonDropdownIcon}
                             numberOfLines={1}
                         >
-                            {props.value}
+                            {props.value || (
+                                <Icon
+                                    src={Expensicons.Emoji}
+                                    fill={StyleUtils.getIconFillColor(CONST.BUTTON_STATES.DISABLED)}
+                                />
+                            )}
                         </Text>
                         <View style={[styles.popoverMenuIcon, styles.pointerEventsAuto, props.disabled && styles.cursorDisabled, styles.rotate90]}>
                             <Icon
diff --git a/src/pages/settings/Profile/CustomStatus/StatusPage.js b/src/pages/settings/Profile/CustomStatus/StatusPage.js
index 9888bf80508b..0183e0cc8a2d 100644
--- a/src/pages/settings/Profile/CustomStatus/StatusPage.js
+++ b/src/pages/settings/Profile/CustomStatus/StatusPage.js
@@ -53,7 +53,7 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
     const draftText = lodashGet(draftStatus, 'text');
     const draftClearAfter = lodashGet(draftStatus, 'clearAfter');
 
-    const defaultEmoji = draftEmojiCode || currentUserEmojiCode || initialEmoji;
+    const defaultEmoji = draftEmojiCode || currentUserEmojiCode;
     const defaultText = draftText || currentUserStatusText;
 
     const customClearAfter = useMemo(() => {
@@ -79,10 +79,9 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
                 setBrickRoadIndicator(isValidClearAfterDate() ? null : CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR);
                 return;
             }
-
             User.updateCustomStatus({
                 text: statusText,
-                emojiCode,
+                emojiCode: !emojiCode && statusText ? initialEmoji : emojiCode,
                 clearAfter: clearAfterTime !== CONST.CUSTOM_STATUS_TYPES.NEVER ? clearAfterTime : '',
             });
 
@@ -101,7 +100,10 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
             emojiCode: '',
             clearAfter: DateUtils.getEndOfToday(),
         });
-        formRef.current.resetForm({[INPUT_IDS.EMOJI_CODE]: initialEmoji});
+        formRef.current.resetForm({[INPUT_IDS.EMOJI_CODE]: ''});
+        InteractionManager.runAfterInteractions(() => {
+            navigateBackToPreviousScreen();
+        });
     };
 
     useEffect(() => setBrickRoadIndicator(isValidClearAfterDate() ? null : CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR), [isValidClearAfterDate]);