diff --git a/frontend/src/app/components/treasuries/treasuries-graph/treasuries-graph.component.ts b/frontend/src/app/components/treasuries/treasuries-graph/treasuries-graph.component.ts
index 09080f7df..3b4cc6ea4 100644
--- a/frontend/src/app/components/treasuries/treasuries-graph/treasuries-graph.component.ts
+++ b/frontend/src/app/components/treasuries/treasuries-graph/treasuries-graph.component.ts
@@ -170,7 +170,7 @@ export class TreasuriesGraphComponent implements OnInit, OnChanges, OnDestroy {
 
     this.seriesNameToLabel = {};
     for (const treasury of this.treasuries) {
-      this.seriesNameToLabel[treasury.wallet] = treasury.enterprise || treasury.name;
+      this.seriesNameToLabel[treasury.wallet] = treasury.name || treasury.enterprise || treasury.wallet;
     }
 
     const legendData = this.treasuries.map(treasury => ({
@@ -301,7 +301,7 @@ export class TreasuriesGraphComponent implements OnInit, OnChanges, OnDestroy {
                 const marker = `<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${markerColor};"></span>`;
 
                 tooltip += `<div style="display: flex; justify-content: space-between;">
-                  <span style="text-align: left; margin-right: 10px;">${marker} ${treasury.enterprise || treasury.name}:</span>
+                  <span style="text-align: left; margin-right: 10px;">${marker} ${treasury.name || treasury.enterprise || treasury.wallet}:</span>
                   <span style="text-align: right;">${this.formatBTC(balance)}</span>
                 </div>`;
               }
diff --git a/frontend/src/app/components/treasuries/treasuries-pie/treasuries-pie.component.ts b/frontend/src/app/components/treasuries/treasuries-pie/treasuries-pie.component.ts
index b0daae4bb..0219f4642 100644
--- a/frontend/src/app/components/treasuries/treasuries-pie/treasuries-pie.component.ts
+++ b/frontend/src/app/components/treasuries/treasuries-pie/treasuries-pie.component.ts
@@ -115,7 +115,7 @@ export class TreasuriesPieComponent implements OnChanges {
     }[] = this.treasuries.map((treasury, index) => ({
       treasury,
       id: treasury.wallet,
-      label: treasury.enterprise || treasury.name,
+      label: treasury.name || treasury.enterprise || treasury.wallet,
       balance: this.walletBalance[treasury.wallet],
       share: (this.walletBalance[treasury.wallet] / total) * 100,
       color: chartColors[index % chartColors.length],
diff --git a/frontend/src/app/components/treasuries/treasuries.component.html b/frontend/src/app/components/treasuries/treasuries.component.html
index 9744f37c4..f86a3ccf3 100644
--- a/frontend/src/app/components/treasuries/treasuries.component.html
+++ b/frontend/src/app/components/treasuries/treasuries.component.html
@@ -23,7 +23,7 @@
                       <span class="position-number">{{i + 1}}</span>
                     </div>
                   </td>
-                  <td class="table-cell-name">{{ treasury.enterprise || treasury.name }}</td>
+                  <td class="table-cell-name">{{ treasury.name || treasury.enterprise || treasury.wallet }}</td>
                   <td class="table-cell-balance">
                     <app-amount [satoshis]="walletStats[treasury.wallet]?.balance || 0" digitsInfo="1.2-4" [noFiat]="true"></app-amount>
                   </td>