diff --git a/ui/imports/shared/status/StatusEmojiPopup.qml b/ui/imports/shared/status/StatusEmojiPopup.qml
index 20021df073..7d044e406e 100644
--- a/ui/imports/shared/status/StatusEmojiPopup.qml
+++ b/ui/imports/shared/status/StatusEmojiPopup.qml
@@ -60,6 +60,9 @@ Popup {
 
         // Add at the  start of the list
         let recentEmojis = localAccountSensitiveSettings.recentEmojis
+        if (recentEmojis === undefined) {
+            recentEmojis = []
+        }
         recentEmojis.unshift(emoji)
         // Remove duplicates
         recentEmojis = recentEmojis.filter(function (e, index) {
diff --git a/vendor/status-go b/vendor/status-go
index 2485e84bf5..6b9f9a896a 160000
--- a/vendor/status-go
+++ b/vendor/status-go
@@ -1 +1 @@
-Subproject commit 2485e84bf5b3abd3829d40709869c8ec32408a39
+Subproject commit 6b9f9a896aadd41b1ace60dc1403122a52e7c9bf