diff --git a/app/components/savings/funding_accounts_breakdown_component.html.erb b/app/components/savings/funding_accounts_breakdown_component.html.erb
index ca3f674fb..fee45f857 100644
--- a/app/components/savings/funding_accounts_breakdown_component.html.erb
+++ b/app/components/savings/funding_accounts_breakdown_component.html.erb
@@ -4,7 +4,7 @@
   <div class="flex h-2 rounded-full overflow-hidden mb-4">
     <% rows.each do |row| %>
       <% next if row[:amount].to_d.zero? %>
-      <div style="width: <%= percent_for(row[:amount]) %>%; background-color: <%= goal.color %>;"
+      <div style="width: <%= percent_for(row[:amount]) %>%; background-color: <%= Savings::GoalAvatarComponent.color_for(row[:account].name) %>;"
            title="<%= row[:account].name %>"></div>
     <% end %>
   </div>
@@ -12,7 +12,7 @@
   <ul class="space-y-3">
     <% rows.each do |row| %>
       <li class="flex items-center gap-3">
-        <%= render Savings::GoalAvatarComponent.new(name: row[:account].name, color: goal.color, size: "sm") %>
+        <%= render Savings::GoalAvatarComponent.new(name: row[:account].name, color: Savings::GoalAvatarComponent.color_for(row[:account].name), size: "sm") %>
         <div class="flex-1 min-w-0">
           <p class="text-sm font-medium text-primary truncate"><%= row[:account].name %></p>
           <p class="text-[11px] text-subdued"><%= row[:account].subtype&.titleize || row[:account].accountable_type %> · <%= t("savings_goals.show.funding_balance", amount: Money.new(row[:account].balance, row[:account].currency).format) %></p>
diff --git a/app/views/savings_goals/_contributions_list.html.erb b/app/views/savings_goals/_contributions_list.html.erb
index 880628cba..5660ddcf1 100644
--- a/app/views/savings_goals/_contributions_list.html.erb
+++ b/app/views/savings_goals/_contributions_list.html.erb
@@ -10,7 +10,7 @@
       <li class="flex items-center gap-3 px-2 py-2 rounded-lg hover:bg-surface-hover">
         <%= render Savings::GoalAvatarComponent.new(
           name: contribution.account.name,
-          color: @savings_goal.color,
+          color: Savings::GoalAvatarComponent.color_for(contribution.account.name),
           size: "sm"
         ) %>
         <div class="flex-1 min-w-0">