diff --git a/src/status_im/chat/screen.cljs b/src/status_im/chat/screen.cljs
index 86b2d74226..dcc0704317 100644
--- a/src/status_im/chat/screen.cljs
+++ b/src/status_im/chat/screen.cljs
@@ -188,7 +188,8 @@
    show-emoji?       [:chat-ui-props :show-emoji?]
    command?          [:command?]
    layout-height     [:get :layout-height]]
-  {:component-did-mount #(dispatch [:check-autorun])}
+  {:component-did-mount #(dispatch [:check-autorun])
+   :component-will-unmount #(dispatch [:set-chat-ui-props :show-emoji? false])}
   [view {:style    st/chat-view
          :onLayout (fn [event]
                      (let [height (.. event -nativeEvent -layout -height)]