diff --git a/app/components/post_draft/custom_emoji_picker/emoji_picker_header/emoji_picker_header.tsx b/app/components/post_draft/custom_emoji_picker/emoji_picker_header/emoji_picker_header.tsx
index 94a37b861..5018da442 100644
--- a/app/components/post_draft/custom_emoji_picker/emoji_picker_header/emoji_picker_header.tsx
+++ b/app/components/post_draft/custom_emoji_picker/emoji_picker_header/emoji_picker_header.tsx
@@ -229,13 +229,11 @@ const EmojiPickerHeader: React.FC<Props> = ({
                     showSoftInputOnFocus={Platform.OS !== 'android' || showKeyboard}
                 />
             </View>
-            {Platform.OS !== 'android' &&
-                <SkinToneSelector
-                    skinTone={skinTone}
-                    containerWidth={containerWidth}
-                    isSearching={isSearching}
-                />
-            }
+            <SkinToneSelector
+                skinTone={skinTone}
+                containerWidth={containerWidth}
+                isSearching={isSearching}
+            />
         </View>
     );
 };
diff --git a/app/screens/emoji_picker/picker/header/skintone_selector/skintone_selector.tsx b/app/screens/emoji_picker/picker/header/skintone_selector/skintone_selector.tsx
index 37d63dc09..c16d868df 100644
--- a/app/screens/emoji_picker/picker/header/skintone_selector/skintone_selector.tsx
+++ b/app/screens/emoji_picker/picker/header/skintone_selector/skintone_selector.tsx
@@ -129,6 +129,9 @@ const SkinToneSelector = ({skinTone = 'default', containerWidth, isSearching, tu
                 setTooltipVisible(true);
             }
         });
+
+        // tutorialWatched is not a dependency because it is not used in the effect
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
     return (
@@ -145,7 +148,7 @@ const SkinToneSelector = ({skinTone = 'default', containerWidth, isSearching, tu
             >
                 <Animated.View
                     style={widthAnimatedStyle}
-                    exiting={Platform.OS === 'android' ? undefined : FadeOut /* https://mattermost.atlassian.net/browse/MM-63814?focusedCommentId=178584 */}
+                    exiting={Platform.select({ios: FadeOut})} /* https://mattermost.atlassian.net/browse/MM-63814?focusedCommentId=178584 */
                     entering={FadeIn}
                 >
                     <Animated.View style={[styles.container, opacityStyle]}>
@@ -162,7 +165,7 @@ const SkinToneSelector = ({skinTone = 'default', containerWidth, isSearching, tu
             <Animated.View
                 style={styles.expanded}
                 entering={entering}
-                exiting={exiting}
+                exiting={Platform.select({ios: exiting})} /* https://mattermost.atlassian.net/browse/MM-63814?focusedCommentId=178584 */
             >
                 {!isTablet && <CloseButton collapse={collapse}/>}
                 <SkinSelector