diff --git a/lnbits/core/crud/wallets.py b/lnbits/core/crud/wallets.py
index e63a6991a..94d45e43d 100644
--- a/lnbits/core/crud/wallets.py
+++ b/lnbits/core/crud/wallets.py
@@ -23,7 +23,7 @@ async def create_wallet(
         user=user_id,
         adminkey=uuid4().hex,
         inkey=uuid4().hex,
-        currency='USD',
+        currency="USD",
     )
     await (conn or db).insert("wallets", wallet)
     return wallet
diff --git a/lnbits/core/migrations.py b/lnbits/core/migrations.py
index 99bb00575..2d4f059c8 100644
--- a/lnbits/core/migrations.py
+++ b/lnbits/core/migrations.py
@@ -683,4 +683,4 @@ async def m029_create_audit_table(db: Connection):
             created_at TIMESTAMP NOT NULL DEFAULT {db.timestamp_now}
         );
         """
-    )
\ No newline at end of file
+    )
diff --git a/lnbits/static/js/wallet.js b/lnbits/static/js/wallet.js
index 0bc7f08db..0b2b4a571 100644
--- a/lnbits/static/js/wallet.js
+++ b/lnbits/static/js/wallet.js
@@ -727,7 +727,10 @@ window.app = Vue.createApp({
       this.$q.localStorage.set('lnbits.disclaimerShown', true)
     }
     // check blanace priority
-    if (this.$q.localStorage.getItem('lnbits.isPrioritySwapped')) {
+    if (
+      this.$q.localStorage.getItem('lnbits.isPrioritySwapped') &&
+      this.g.wallet.currency
+    ) {
       this.isPrioritySwapped = this.$q.localStorage.getItem(
         'lnbits.isPrioritySwapped'
       )