diff --git a/app/models/account/activity_feed_data.rb b/app/models/account/activity_feed_data.rb
index d6e5b14c..4b2de075 100644
--- a/app/models/account/activity_feed_data.rb
+++ b/app/models/account/activity_feed_data.rb
@@ -6,11 +6,17 @@ class Account::ActivityFeedData
 
   def initialize(account, entries)
     @account = account
-    @entries = entries
+    @entries = entries.to_a
   end
 
   # We read balances so we can show "start of day" -> "end of day" balances for each entry date group in the feed
   def balances
+    @balances ||= begin
+      min_date = entries.min_by(&:date).date.prev_day
+      max_date = entries.max_by(&:date).date
+
+      account.balances.where(date: min_date..max_date, currency: account.currency).order(:date)
+    end
   end
 
 
diff --git a/app/models/balance/trend_calculator.rb b/app/models/balance/trend_calculator.rb
deleted file mode 100644
index 990a8339..00000000
--- a/app/models/balance/trend_calculator.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# The current system calculates a single, end-of-day balance every day for each account for simplicity.
-# In most cases, this is sufficient.  However, for the "Activity View", we need to show intraday balances
-# to show users how each entry affects their balances.  This class calculates intraday balances by
-# interpolating between end-of-day balances.
-class Balance::TrendCalculator
-  BalanceTrend = Struct.new(:trend, :cash, keyword_init: true)
-
-  def initialize(balances)
-    @balances = balances
-  end
-
-  def trend_for(date)
-    balance = @balances.find { |b| b.date == date }
-    prior_balance = @balances.find { |b| b.date == date - 1.day }
-
-    return BalanceTrend.new(trend: nil) unless balance.present?
-
-    BalanceTrend.new(
-      trend: Trend.new(
-        current: Money.new(balance.balance, balance.currency),
-        previous: prior_balance.present? ? Money.new(prior_balance.balance, balance.currency) : nil,
-        favorable_direction: balance.account.favorable_direction
-      ),
-      cash: Money.new(balance.cash_balance, balance.currency),
-    )
-  end
-
-  private
-    attr_reader :balances
-end
diff --git a/app/views/accounts/show/_activity.html.erb b/app/views/accounts/show/_activity.html.erb
index 3c454f2d..69875439 100644
--- a/app/views/accounts/show/_activity.html.erb
+++ b/app/views/accounts/show/_activity.html.erb
@@ -76,11 +76,9 @@
 
         <div>
           <div class="space-y-4">
-            <% calculator = Balance::TrendCalculator.new(@account.balances) %>
-
             <%= entries_by_date(@entries) do |entries| %>
               <% entries.each_with_index do |entry, index| %>
-                <%= render entry, balance_trend: index == 0 ? calculator.trend_for(entry.date) : nil, view_ctx: "account" %>
+                <%= render entry, view_ctx: "account" %>
               <% end %>
             <% end %>
           </div>
diff --git a/app/views/trades/_trade.html.erb b/app/views/trades/_trade.html.erb
index 7d940aa6..4e088e9c 100644
--- a/app/views/trades/_trade.html.erb
+++ b/app/views/trades/_trade.html.erb
@@ -38,16 +38,6 @@
                     format_money(-entry.amount_money),
                     class: ["text-green-600": entry.amount.negative?] %>
       </div>
-
-      <div class="col-span-2 justify-self-end">
-        <% if balance_trend&.trend %>
-          <div class="flex items-center gap-2">
-            <%= tag.p format_money(balance_trend.trend.current), class: "font-medium text-sm text-primary" %>
-          </div>
-        <% else %>
-          <%= tag.p "--", class: "font-medium text-sm text-gray-400" %>
-        <% end %>
-      </div>
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/transactions/_transaction.html.erb b/app/views/transactions/_transaction.html.erb
index b603e305..0abb1b28 100644
--- a/app/views/transactions/_transaction.html.erb
+++ b/app/views/transactions/_transaction.html.erb
@@ -6,7 +6,7 @@
   <%= turbo_frame_tag dom_id(transaction) do %>
     <div class="grid grid-cols-12 items-center text-primary text-sm font-medium p-4 lg:p-4 <%= entry.excluded ? "opacity-50 text-gray-400" : "" %>">
 
-      <div class="pr-4 lg:pr-10 flex items-center gap-3 lg:gap-4 col-span-8 <%= view_ctx == "global" ? "lg:col-span-8" : "lg:col-span-6" %>">
+      <div class="pr-4 lg:pr-10 flex items-center gap-3 lg:gap-4 col-span-8">
         <%= check_box_tag dom_id(entry, "selection"),
             disabled: transaction.transfer.present?,
             class: "checkbox checkbox--light",
@@ -93,22 +93,11 @@
         <%= render "transactions/transaction_category", transaction: transaction %>
       </div>
 
-      <div class="col-span-4 lg:col-span-2 ml-auto text-right">
+      <div class="col-span-2 ml-auto text-right">
         <%= content_tag :p,
             transaction.transfer? && view_ctx == "global" ? "+/- #{format_money(entry.amount_money.abs)}" : format_money(-entry.amount_money),
             class: ["text-green-600": entry.amount.negative?] %>
-      </div>
-
-      <% if view_ctx != "global" %>
-        <div class="col-span-2 justify-self-end hidden lg:block">
-          <% if balance_trend&.trend %>
-            <%= tag.p format_money(balance_trend.trend.current),
-                class: "font-medium text-sm text-primary" %>
-          <% else %>
-            <%= tag.p "--", class: "font-medium text-sm text-gray-400" %>
-          <% end %>
-        </div>
-      <% end %>
+      </div> 
     </div>
   <% end %>
 <% end %>