diff --git a/src/status_im/constants.cljs b/src/status_im/constants.cljs
index e741c75c0d..d22cf583f0 100644
--- a/src/status_im/constants.cljs
+++ b/src/status_im/constants.cljs
@@ -101,11 +101,12 @@
                    (merge testnet-networks mainnet-networks sidechain-networks))))
 
 (defn default-account-settings []
-  {:wallet {:visible-tokens {:testnet #{:STT :HND}
-                             :mainnet #{:SNT}
-                             :rinkeby #{:MOKSHA :KDO}
-                             :xdai    #{}
-                             :poa     #{}}}})
+  {:web3-opt-in? true
+   :wallet       {:visible-tokens {:testnet #{:STT :HND}
+                                   :mainnet #{:SNT}
+                                   :rinkeby #{:MOKSHA :KDO}
+                                   :xdai    #{}
+                                   :poa     #{}}}})
 
 (def currencies
   {:aed {:id :aed :code "AED" :display-name (i18n/label :t/currency-display-name-aed) :symbol "د.إ"}
diff --git a/src/status_im/ui/screens/browser/views.cljs b/src/status_im/ui/screens/browser/views.cljs
index 61ecddd367..6b07faaa03 100644
--- a/src/status_im/ui/screens/browser/views.cljs
+++ b/src/status_im/ui/screens/browser/views.cljs
@@ -190,7 +190,7 @@
     (let [can-go-back?    (browser/can-go-back? browser)
           can-go-forward? (browser/can-go-forward? browser)
           url-original    (browser/get-current-url browser)
-          opt-in?         (:web3-opt-in? settings)]
+          opt-in?         (or (nil? (:web3-opt-in? settings)) (:web3-opt-in? settings))]
       [react/view {:style styles/browser :on-layout #(reset! width (.-width (.-layout (.-nativeEvent %))))}
        [status-bar/status-bar]
        [toolbar error? url url-original browser browser-id url-editing?]
diff --git a/src/status_im/ui/screens/profile/user/views.cljs b/src/status_im/ui/screens/profile/user/views.cljs
index 0ef4cfe493..43008f9af8 100644
--- a/src/status_im/ui/screens/profile/user/views.cljs
+++ b/src/status_im/ui/screens/profile/user/views.cljs
@@ -124,7 +124,7 @@
      [profile.components/settings-item-separator]
      [profile.components/settings-switch-item
       {:label-kw  :t/web3-opt-in
-       :value     (:web3-opt-in? settings)
+       :value     (or (nil? (:web3-opt-in? settings)) (:web3-opt-in? settings))
        :action-fn #(re-frame/dispatch [:accounts.ui/web3-opt-in-mode-switched %])}]
      [profile.components/settings-item-separator]
      [profile.components/settings-item