diff --git a/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml b/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml
index d594f61855..849609eec0 100644
--- a/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml
+++ b/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml
@@ -78,7 +78,7 @@ Item {
             onClosed: {
                 destroy();
             }
-            selectedAccount: currentAccount
+            selectedAccount: RootStore.leggacyCurrentAccount
         }
     }
 
diff --git a/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml b/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
index 601241e3bb..dfb97302b8 100644
--- a/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
@@ -47,7 +47,7 @@ ModalPopup {
         id: accountSelector
         label: ""
         showAccountDetails: false
-        accounts: RootStore.accounts
+        accounts: RootStore.leggacyAccounts
         currency: RootStore.currentCurrency
         anchors.top: qrCodeBox.bottom
         anchors.topMargin: Style.current.padding
diff --git a/ui/app/AppLayouts/Wallet/stores/RootStore.qml b/ui/app/AppLayouts/Wallet/stores/RootStore.qml
index 1f8073f471..0ac142d929 100644
--- a/ui/app/AppLayouts/Wallet/stores/RootStore.qml
+++ b/ui/app/AppLayouts/Wallet/stores/RootStore.qml
@@ -5,6 +5,10 @@ import QtQuick 2.13
 QtObject {
     id: root
 
+    // TODO: Received modal is not yet migrated
+    property var leggacyAccounts: walletModel.accountsView.accounts
+    property var leggacyCurrentAccount: walletModel.accountsView.currentAccount
+
     property var currentAccount: walletSectionCurrent
     property var accounts: walletSectionAccounts.model