diff --git a/static/js/index.js b/static/js/index.js
index 687db7d..ee3e587 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -181,13 +181,13 @@ window.app = Vue.createApp({
         this.lamassuConfig = data
 
         // When opening config dialog, populate the selected wallets if they exist
-        if (data && data.source_wallet_id && this.g.user?.wallets) {
+        if (data && data.source_wallet_id) {
           const wallet = this.g.user.wallets.find(w => w.id === data.source_wallet_id)
           if (wallet) {
             this.configDialog.data.selectedWallet = wallet
           }
         }
-        if (data && data.commission_wallet_id && this.g.user?.wallets) {
+        if (data && data.commission_wallet_id) {
           const commissionWallet = this.g.user.wallets.find(w => w.id === data.commission_wallet_id)
           if (commissionWallet) {
             this.configDialog.data.selectedCommissionWallet = commissionWallet
diff --git a/templates/satmachineadmin/index.html b/templates/satmachineadmin/index.html
index 83de8c7..46eef37 100644
--- a/templates/satmachineadmin/index.html
+++ b/templates/satmachineadmin/index.html
@@ -547,17 +547,17 @@
         <q-select
           filled
           dense
-          :options="g.user?.wallets || []"
+          :options="g.user.wallets"
           v-model="configDialog.data.selectedWallet"
           label="Source Wallet for DCA Distributions *"
           option-label="name"
           hint="Wallet that holds Bitcoin for distribution to DCA clients"
         ></q-select>
-
+        
         <q-select
           filled
           dense
-          :options="g.user?.wallets || []"
+          :options="g.user.wallets"
           v-model="configDialog.data.selectedCommissionWallet"
           label="Commission Wallet (Optional)"
           option-label="name"