diff --git a/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.js b/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.js
index 83383a71..0b2b6a1d 100644
--- a/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.js
+++ b/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.js
@@ -92,14 +92,6 @@ async function walletList(path) {
               })
               await this.refreshWalletAccounts()
 
-              if (
-                this.payment.changeWallet &&
-                this.payment.changeWallet.id === walletAccountId
-              ) {
-                this.payment.changeWallet = this.walletAccounts[0]
-                this.selectChangeAddress(this.payment.changeWallet)
-              }
-              await this.scanAddressWithAmount()
             } catch (error) {
               this.$q.notify({
                 type: 'warning',
@@ -172,7 +164,6 @@ async function walletList(path) {
         const wallet = this.walletAccounts.find(w => w.id === walletId) || {}
         wallet.address_no = addressData.addressIndex
         this.$emit('new-receive-address', addressData)
-        this.$emit('accounts-update', this.walletAccounts)
       }
     },
     created: async function () {
diff --git a/lnbits/extensions/watchonly/static/js/index.js b/lnbits/extensions/watchonly/static/js/index.js
index 1c7425f5..be0dff4c 100644
--- a/lnbits/extensions/watchonly/static/js/index.js
+++ b/lnbits/extensions/watchonly/static/js/index.js
@@ -1053,6 +1053,7 @@ const watchOnly = async () => {
       updateAccounts: async function (accounts) {
         this.walletAccounts = accounts
         await this.refreshAddresses()
+        await this.scanAddressWithAmount()
 
         if (this.payment.changeWallet) {
           const changeAccount = this.walletAccounts.find(