diff --git a/src/status_im/chat/models/link_preview.cljs b/src/status_im/chat/models/link_preview.cljs
index 3142d0fbed..5a60a7fbbd 100644
--- a/src/status_im/chat/models/link_preview.cljs
+++ b/src/status_im/chat/models/link_preview.cljs
@@ -63,8 +63,7 @@
 
 (fx/defn save-link-preview-whitelist
   {:events [::link-preview-whitelist-received]}
-  [cofx whitelist]
-  (fx/merge cofx
-            (multiaccounts.update/multiaccount-update
-             :link-previews-whitelist whitelist {})))
+  [{:keys [db]} whitelist]
+  {:db (assoc db :link-previews-whitelist
+              whitelist)})
 
diff --git a/src/status_im/db.cljs b/src/status_im/db.cljs
index c392e9eac5..9d770f0f4c 100644
--- a/src/status_im/db.cljs
+++ b/src/status_im/db.cljs
@@ -11,6 +11,7 @@
              :current-chat-id                    nil
              :selected-participants              #{}
              :sync-state                         :done
+             :link-previews-whitelist            []
              :app-state                          "active"
              :wallet                              wallet.db/default-wallet
              :wallet/all-tokens                  {}
diff --git a/src/status_im/subs.cljs b/src/status_im/subs.cljs
index 155c656d19..c49b3bf7e0 100644
--- a/src/status_im/subs.cljs
+++ b/src/status_im/subs.cljs
@@ -79,6 +79,7 @@
 (reg-root-key-sub :app-active-since :app-active-since)
 (reg-root-key-sub :connectivity/ui-status-properties :connectivity/ui-status-properties)
 (reg-root-key-sub :logged-in-since :logged-in-since)
+(reg-root-key-sub :link-previews-whitelist :link-previews-whitelist)
 
 ;;NOTE this one is not related to ethereum network
 ;; it is about cellular network/ wifi network
@@ -2545,14 +2546,6 @@
 
 ;; LINK PREVIEW ========================================================================================================
 
-(re-frame/reg-sub
- :link-preview/whitelist
- :<- [:multiaccount]
- (fn [multiaccount]
-   (filter (fn [{:keys [address]}]
-             (config/link-preview-enabled-site? address))
-           (get multiaccount :link-previews-whitelist))))
-
 (re-frame/reg-sub
  :link-preview/cache
  :<- [:multiaccount]
diff --git a/src/status_im/ui/screens/chat/message/link_preview.cljs b/src/status_im/ui/screens/chat/message/link_preview.cljs
index 362c5ef59b..05068316e7 100644
--- a/src/status_im/ui/screens/chat/message/link_preview.cljs
+++ b/src/status_im/ui/screens/chat/message/link_preview.cljs
@@ -91,7 +91,7 @@
 (defview link-preview-wrapper [links outgoing timeline]
   (letsubs
     [ask-user? [:link-preview/link-preview-request-enabled]
-     whitelist [:link-preview/whitelist]
+     whitelist [:link-previews-whitelist]
      enabled-sites   [:link-preview/enabled-sites]]
     (when links
       (let [link-info (previewable-link links whitelist enabled-sites)
diff --git a/src/status_im/ui/screens/link_previews_settings/views.cljs b/src/status_im/ui/screens/link_previews_settings/views.cljs
index ec387b9977..fc4defab77 100644
--- a/src/status_im/ui/screens/link_previews_settings/views.cljs
+++ b/src/status_im/ui/screens/link_previews_settings/views.cljs
@@ -22,7 +22,7 @@
                    [::link-preview/enable title ((complement boolean) enabled?)])})))
 
 (views/defview link-previews-settings []
-  (views/letsubs [link-previews-whitelist [:link-preview/whitelist]
+  (views/letsubs [link-previews-whitelist [:link-previews-whitelist]
                   link-previews-enabled-sites [:link-preview/enabled-sites]]
     (let [all-enabled (= (count link-previews-whitelist) (count link-previews-enabled-sites))]
       [react/view {:flex 1}