diff --git a/src/app/components/configure-wallet/configure-wallet.component.html b/src/app/components/configure-wallet/configure-wallet.component.html
index b929e44..058f682 100644
--- a/src/app/components/configure-wallet/configure-wallet.component.html
+++ b/src/app/components/configure-wallet/configure-wallet.component.html
@@ -1,7 +1,7 @@
 <h2 class="uk-heading-divider">Configure Wallet</h2>
 
-<div *ngIf="isConfigured() && (activePanel === panels.landing || activePanel === panels.import || activePanel === panels.mnemonicTypeSelection)" class="uk-margin-small-bottom">
-  <div *ngIf="!walletService.isLedgerWallet()" class="uk-alert uk-alert-danger nlt-inline-alert">
+<div *ngIf="isConfigured() && !walletService.isLedgerWallet() && (activePanel === panels.landing || activePanel === panels.import || activePanel === panels.mnemonicTypeSelection)" class="uk-margin-small-bottom">
+  <div class="uk-alert uk-alert-danger nlt-inline-alert">
     <div class="icon-column">
       <div uk-icon="icon: warning; ratio: 2;"></div>
     </div>
@@ -11,15 +11,6 @@
       Without it, <b>any funds you have will become completely unrecoverable!</b>
     </p>
   </div>
-  <div *ngIf="walletService.isLedgerWallet()" class="uk-alert uk-alert-info nlt-inline-alert">
-    <div class="icon-column">
-      <div uk-icon="icon: info; ratio: 2;"></div>
-    </div>
-    <p>
-      <b>You are about to configure a new wallet, which will disconnect your Ledger device from Nault</b><br>
-      If you need to use the Ledger wallet later, simply import your device again.
-    </p>
-  </div>
 </div>
 
 <div class="uk-card uk-card-default wallet-setup-card" *ngIf="activePanel === panels.landing">
diff --git a/src/app/components/configure-wallet/configure-wallet.component.ts b/src/app/components/configure-wallet/configure-wallet.component.ts
index 69cf393..913dec0 100644
--- a/src/app/components/configure-wallet/configure-wallet.component.ts
+++ b/src/app/components/configure-wallet/configure-wallet.component.ts
@@ -190,10 +190,10 @@ export class ConfigureWalletComponent implements OnInit {
 
     const UIkit = window['UIkit'];
     try {
-      if (!this.walletService.isLedgerWallet()) {
-        const msg = '<p class="uk-alert uk-alert-danger"><br><span class="uk-flex"><span uk-icon="icon: warning; ratio: 3;" class="uk-align-center"></span></span><span style="font-size: 18px;">You are about to configure a new wallet, which will <b>replace your currently configured wallet</b>.</span><br><br><b style="font-size: 18px;">' + this.translocoService.translate('reset-wallet.before-continuing-make-sure-you-have-saved-the-nano-seed') + '</b><br><br><b style="font-size: 18px;">' + this.translocoService.translate('reset-wallet.you-will-not-be-able-to-recover-the-funds-without-a-backup') + '</b></p><br>';
-        await UIkit.modal.confirm(msg);
-      }
+      const msg = this.walletService.isLedgerWallet()
+        ? '<p class="uk-alert uk-alert-info"><br><span class="uk-flex"><span uk-icon="icon: info; ratio: 3;" class="uk-align-center"></span></span><span style="font-size: 18px;">You are about to configure a new wallet, which will <b>disconnect your Ledger device from Nault</b>.</span><br><br>If you need to use the Ledger wallet, simply import your device again.</p><br>'
+        : '<p class="uk-alert uk-alert-danger"><br><span class="uk-flex"><span uk-icon="icon: warning; ratio: 3;" class="uk-align-center"></span></span><span style="font-size: 18px;">You are about to configure a new wallet, which will <b>replace your currently configured wallet</b>.</span><br><br><b style="font-size: 18px;">' + this.translocoService.translate('reset-wallet.before-continuing-make-sure-you-have-saved-the-nano-seed') + '</b><br><br><b style="font-size: 18px;">' + this.translocoService.translate('reset-wallet.you-will-not-be-able-to-recover-the-funds-without-a-backup') + '</b></p><br>';
+      await UIkit.modal.confirm(msg);
       return true;
     } catch (err) {
       if (!this.walletService.isLedgerWallet()) {