diff --git a/lib/outboxer/message.rb b/lib/outboxer/message.rb
index e19a6381..70691695 100644
--- a/lib/outboxer/message.rb
+++ b/lib/outboxer/message.rb
@@ -712,48 +712,17 @@ def rollup_counts(time: Time)
     def count_by_status
       ActiveRecord::Base.connection_pool.with_connection do
         result = Models::Message::Count.select(
-          "COALESCE(SUM(queued), 0) AS queued",
-          "COALESCE(SUM(publishing), 0) AS publishing",
-          "COALESCE(SUM(published), 0) AS published",
-          "COALESCE(SUM(failed), 0) AS failed"
+          "COALESCE(SUM(queued), 0)      AS queued",
+          "COALESCE(SUM(publishing), 0)  AS publishing",
+          "COALESCE(SUM(published), 0)   AS published",
+          "COALESCE(SUM(failed), 0)      AS failed",
+          "COALESCE(SUM(queued + publishing + published + failed), 0) AS total"
         ).take
 
         result.attributes.symbolize_keys.slice(
-          :queued, :publishing, :published, :failed
-        )
-      end
-    end
-
-    # Retrieves and calculates metrics related to message statuses,
-    # using the unified Counter.total for all counts.
-    # Latency and throughput are placeholders (0) until time-series metrics are implemented.
-    #
-    # @return [Hash] detailed metrics across various message statuses.
-    def metrics
-      totals = count_by_status
-
-      metrics = {
-        all: {
-          count: {
-            total: totals.values.sum
-          }
-        }
-      }
-
-      {
-        queued: :queued,
-        publishing: :publishing,
-        published: :published,
-        failed: :failed
-      }.each do |status, field|
-        metrics[status] = {
-          count: { total: totals[field].to_i },
-          latency: 0,
-          throughput: 0
-        }
+          :queued, :publishing, :published, :failed, :total
+        ).transform_values(&:to_i)
       end
-
-      metrics
     end
   end
 end
diff --git a/lib/outboxer/web.rb b/lib/outboxer/web.rb
index 005edd67..5c6fb213 100755
--- a/lib/outboxer/web.rb
+++ b/lib/outboxer/web.rb
@@ -215,12 +215,12 @@ def time_ago_in_words(time)
         per_page: denormalised_query_params[:per_page],
         time_zone: denormalised_query_params[:time_zone])
 
-      messages_metrics = Message.metrics
+      message_count_by_status = Message.count_by_status
 
       publishers = Publisher.all
 
       erb :home, locals: {
-        messages_metrics: messages_metrics,
+        message_count_by_status: message_count_by_status,
         denormalised_query_params: denormalised_query_params,
         normalised_query_params: normalised_query_params,
         normalised_query_string: normalised_query_string,
@@ -253,12 +253,12 @@ def time_ago_in_words(time)
         per_page: denormalised_query_params[:per_page],
         time_zone: denormalised_query_params[:time_zone])
 
-      messages_metrics = Message.metrics
+      message_count_by_status = Message.count_by_status
 
       publishers = Publisher.all
 
       erb :home, locals: {
-        messages_metrics: messages_metrics,
+        message_count_by_status: message_count_by_status,
         denormalised_query_params: denormalised_query_params,
         normalised_query_params: normalised_query_params,
         normalised_query_string: normalised_query_string,
@@ -311,7 +311,7 @@ def time_ago_in_words(time)
         per_page: denormalised_query_params[:per_page],
         time_zone: denormalised_query_params[:time_zone])
 
-      messages_metrics = Message.metrics
+      message_count_by_status = Message.count_by_status
 
       paginated_messages = Message.list(
         status: denormalised_query_params[:status],
@@ -327,7 +327,7 @@ def time_ago_in_words(time)
         denormalised_query_params: denormalised_query_params)
 
       erb :messages, locals: {
-        messages_metrics: messages_metrics,
+        message_count_by_status: message_count_by_status,
         messages: paginated_messages[:messages],
         denormalised_query_params: denormalised_query_params,
         normalised_query_params: normalised_query_params,
@@ -627,7 +627,7 @@ def normalise_query_string(status: Message::LIST_STATUS_DEFAULT,
         per_page: denormalised_query_params[:per_page],
         time_zone: denormalised_query_params[:time_zone])
 
-      messages_metrics = Message.metrics
+      message_count_by_status = Message.count_by_status
 
       message = Message.find_by_id(id: params[:id])
 
@@ -638,7 +638,7 @@ def normalise_query_string(status: Message::LIST_STATUS_DEFAULT,
         denormalised_query_params: denormalised_query_params,
         normalised_query_params: normalised_query_params,
         normalised_query_string: normalised_query_string,
-        messages_metrics: messages_metrics,
+        message_count_by_status: message_count_by_status,
         message: message,
         messageable: messageable
       }
@@ -654,7 +654,7 @@ def normalise_query_string(status: Message::LIST_STATUS_DEFAULT,
         time_zone: params[:time_zone])
 
       message = Message.find_by_id(id: params[:id])
-      messages_metrics = Message.metrics
+      message_count_by_status = Message.count_by_status
 
       messageable_class = message[:messageable_type]&.safe_constantize
       messageable = messageable_class&.find_by_id(id: message[:messageable_id])
@@ -662,7 +662,7 @@ def normalise_query_string(status: Message::LIST_STATUS_DEFAULT,
       erb :messageable, locals: {
         message: message,
         messageable: messageable,
-        messages_metrics: messages_metrics,
+        message_count_by_status: message_count_by_status,
         denormalised_query_params: denormalised_query_params
       }
     end
@@ -740,10 +740,10 @@ def normalise_query_string(status: Message::LIST_STATUS_DEFAULT,
 
       publisher = Publisher.find_by_id(id: params[:id])
 
-      messages_metrics = Message.metrics
+      message_count_by_status = Message.count_by_status
 
       erb :publisher, locals: {
-        messages_metrics: messages_metrics,
+        message_count_by_status: message_count_by_status,
         denormalised_query_params: denormalised_query_params,
         normalised_query_params: normalised_query_params,
         normalised_query_string: normalised_query_string,
diff --git a/lib/outboxer/web/views/home.erb b/lib/outboxer/web/views/home.erb
index bc3d7479..708d803c 100644
--- a/lib/outboxer/web/views/home.erb
+++ b/lib/outboxer/web/views/home.erb
@@ -123,9 +123,9 @@
                                         <%= status %>
                                     </a>
                                 </td>
-                                <td><%= Outboxer::Web.pretty_number(number: messages_metrics[status.to_sym][:count][:total]) %></td>
-                                <td><%= Outboxer::Web.pretty_throughput(per_second: messages_metrics[status.to_sym][:throughput]) %></td>
-                                <td><%= Outboxer::Web.pretty_duration_from_seconds(seconds: messages_metrics[status.to_sym][:latency]) %></td>
+                                <td><%= Outboxer::Web.pretty_number(number: message_count_by_status[status.to_sym]) %></td>
+                                <td><%= Outboxer::Web.pretty_throughput(per_second: 0) %></td>
+                                <td><%= Outboxer::Web.pretty_duration_from_seconds(seconds: 0) %></td>
                             </tr>
                         <% end %>
                     </tbody>
diff --git a/lib/outboxer/web/views/layout.erb b/lib/outboxer/web/views/layout.erb
index d65deb26..83e46732 100644
--- a/lib/outboxer/web/views/layout.erb
+++ b/lib/outboxer/web/views/layout.erb
@@ -55,7 +55,7 @@
         <div class="container-fluid">
             <a class="navbar-brand" href="<%= outboxer_path('') %>">
                 <i class="bi bi-envelope-open-fill"></i> Outboxer
-                <span class="badge bg-secondary"><%= Outboxer::Web.pretty_number(number: messages_metrics[:published][:count][:total]) %></span>
+                <span class="badge bg-secondary"><%= Outboxer::Web.pretty_number(number: message_count_by_status[:published]) %></span>
             </a>
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
@@ -71,7 +71,7 @@
                     <li class="nav-item">
                         <a class="nav-link <%= 'active' if denormalised_query_params[:status] == nil %>"
                            href="<%= outboxer_path("/messages#{normalise_query_string(status: nil, time_zone: denormalised_query_params[:time_zone])}") %>">
-                            All (<%= Outboxer::Web.pretty_number(number: messages_metrics[:all][:count][:total]) %>)
+                            All (<%= Outboxer::Web.pretty_number(number: message_count_by_status[:total]) %>)
                         </a>
                     </li>
 
@@ -79,7 +79,7 @@
                         <li class="nav-item">
                             <a class="nav-link <%= 'active' if denormalised_query_params[:status] == status[:key] %>"
                                href="<%= outboxer_path("/messages#{normalise_query_string(status: status[:key], time_zone: params[:time_zone])}") %>">
-                                <%= status[:name] %> (<%= Outboxer::Web.pretty_number(number: messages_metrics[status[:key].to_sym][:count][:total]) %>)
+                                <%= status[:name] %> (<%= Outboxer::Web.pretty_number(number: message_count_by_status[status[:key].to_sym]) %>)
                             </a>
                         </li>
                     <% end %>
diff --git a/quickstart_e2e_tests.sh b/quickstart_e2e_tests.sh
index 8369090f..f9e5c433 100755
--- a/quickstart_e2e_tests.sh
+++ b/quickstart_e2e_tests.sh
@@ -76,13 +76,13 @@ attempt = 1
 max_attempts = 10
 delay = 1
 
-published_count = Outboxer::Message.count_by_status["published"]
+published_count = Outboxer::Message.count_by_status[:published]
 
 while (attempt <= max_attempts) && published_count.zero?
   warn "Outboxer not published yet (#{attempt}/#{max_attempts})..."
   sleep delay
   attempt += 1
-  published_count = Outboxer::Message.count_by_status["published"]
+  published_count = Outboxer::Message.count_by_status[:published]
 end
 
 Process.kill("TERM", publisher_pid)
diff --git a/spec/lib/outboxer/message/count_by_status_spec.rb b/spec/lib/outboxer/message/count_by_status_spec.rb
index 6760f787..d9df36e1 100644
--- a/spec/lib/outboxer/message/count_by_status_spec.rb
+++ b/spec/lib/outboxer/message/count_by_status_spec.rb
@@ -27,7 +27,7 @@ module Outboxer
 
       it "returns total counts by status" do
         expect(Message.count_by_status).to eq(
-          queued: 15, publishing: 26, published: 37, failed: 48)
+          queued: 15, publishing: 26, published: 37, failed: 48, total: 126)
       end
     end
   end
diff --git a/spec/lib/outboxer/message/metrics_spec.rb b/spec/lib/outboxer/message/metrics_spec.rb
deleted file mode 100644
index fa97e19b..00000000
--- a/spec/lib/outboxer/message/metrics_spec.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-require "rails_helper"
-
-module Outboxer
-  RSpec.describe Message do
-    describe ".metrics" do
-      let(:current_utc_time) { ::Time.now.utc }
-      let(:time) { double("Time", now: double("Time", utc: current_utc_time)) }
-
-      context "when there are messages in different statuses" do
-        let!(:historic_message_count) do
-          create(:outboxer_message_count, :historic, failed: 500, published: 500)
-        end
-
-        let!(:oldest_queued_message) do
-          Message.queue(messageable: OpenStruct.new(id: "1", type: "Blah"))
-        end
-
-        let!(:newest_queued_message) do
-          Message.queue(messageable: OpenStruct.new(id: "2", type: "Blah"))
-        end
-
-        let!(:oldest_publishing_message) do
-          message = Message.queue(messageable: OpenStruct.new(id: "3", type: "Blah"))
-          Message.publishing
-          message
-        end
-
-        let!(:newest_publishing_message) do
-          message = Message.queue(messageable: OpenStruct.new(id: "4", type: "Blah"))
-          Message.publishing
-          message
-        end
-
-        let!(:oldest_published_message) do
-          message = Message.queue(messageable: OpenStruct.new(id: "5", type: "Blah"))
-          Message.publish do |_message|
-            # do nothing
-          end
-          message
-        end
-
-        let!(:newest_published_message) do
-          message = Message.queue(messageable: OpenStruct.new(id: "6", type: "Blah"))
-          Message.publish do |_message|
-            # do nothing
-          end
-          message
-        end
-
-        let!(:oldest_failed_message) do
-          message = Message.queue(messageable: OpenStruct.new(id: "7", type: "Blah"))
-          Message.publish do |_message|
-            raise "error"
-          end
-          message
-        end
-
-        let!(:newest_failed_message) do
-          message = Message.queue(messageable: OpenStruct.new(id: "8", type: "Blah"))
-          Message.publish do |_message|
-            raise "error"
-          end
-          message
-        end
-
-        it "returns correct settings" do
-          metrics = Message.metrics
-
-          expect(metrics).to eq(
-            all: {
-              count: { total: 1008 }
-            },
-            queued: {
-              count: { total: 2 },
-              latency: 0,
-              throughput: 0
-            },
-            publishing: {
-              count: { total: 2 },
-              latency: 0,
-              throughput: 0
-            },
-            published: {
-              count: { total: 502 },
-              latency: 0,
-              throughput: 0
-            },
-            failed: {
-              count: { total: 502 },
-              latency: 0,
-              throughput: 0
-            })
-        end
-      end
-
-      context "when there are no messages in a specific status" do
-        it "returns zero count and latency for that status" do
-          metrics = Message.metrics
-
-          expect(metrics).to eq(
-            all: { count: { total: 0 } },
-            queued: { count: { total: 0 }, latency: 0, throughput: 0 },
-            publishing: { count: { total: 0 }, latency: 0, throughput: 0 },
-            published: { count: { total: 0 }, latency: 0, throughput: 0 },
-            failed: { count: { total: 0 }, latency: 0, throughput: 0 })
-        end
-      end
-
-      context "when no messages exist" do
-        it "returns zero count and latency for all statuses" do
-          metrics = Message.metrics
-
-          expect(metrics).to eq(
-            all: { count: { total: 0 } },
-            queued: { count: { total: 0 }, latency: 0, throughput: 0 },
-            publishing: { count: { total: 0 }, latency: 0, throughput: 0 },
-            published: { count: { total: 0 }, latency: 0, throughput: 0 },
-            failed: { count: { total: 0 }, latency: 0, throughput: 0 })
-        end
-      end
-    end
-  end
-end