From 29d271cc618273b5a218dd373222017b021f69d5 Mon Sep 17 00:00:00 2001
From: Taras Perun <terry.perun@gmail.com>
Date: Wed, 8 Mar 2023 19:08:32 +0100
Subject: [PATCH] fix preferredEmojiSkinTone

---
 src/libs/actions/Report.js | 2 +-
 src/setup/index.js         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index afd6692d7d40..c4549b6cc121 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -42,7 +42,7 @@ Onyx.connect({
     callback: (val) => {
         // the preferred skin tone is sometimes still "default", although it
         // was changed that "default" has become -1.
-        if (Number.isInteger(Number(val))) {
+        if (!_.isNull(val) && Number.isInteger(Number(val))) {
             preferredSkinTone = val;
         } else {
             preferredSkinTone = -1;
diff --git a/src/setup/index.js b/src/setup/index.js
index b2fea9a98ad8..9641101a7f56 100644
--- a/src/setup/index.js
+++ b/src/setup/index.js
@@ -39,6 +39,7 @@ export default function () {
             },
             [ONYXKEYS.IS_SIDEBAR_LOADED]: false,
             [ONYXKEYS.SHOULD_SHOW_COMPOSE_INPUT]: true,
+            [ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE]: -1,
         },
     });