diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index fe314daeca6..dc7908c725d 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -12,7 +12,7 @@ module Admin
       @pending_tags_count    = pending_tags.async_count
       @pending_users_count   = User.pending.async_count
       @system_checks         = Admin::SystemCheck.perform(current_user)
-      @time_period           = (29.days.ago.to_date...Time.now.utc.to_date)
+      @time_period           = (29.days.ago.to_date..Time.now.utc.to_date)
     end
 
     private
diff --git a/app/controllers/admin/instances/moderation_notes_controller.rb b/app/controllers/admin/instances/moderation_notes_controller.rb
index dd6c32bda57..d92e53c326a 100644
--- a/app/controllers/admin/instances/moderation_notes_controller.rb
+++ b/app/controllers/admin/instances/moderation_notes_controller.rb
@@ -13,7 +13,7 @@ class Admin::Instances::ModerationNotesController < Admin::BaseController
       redirect_to admin_instance_path(@instance.domain, anchor: helpers.dom_id(@instance_moderation_note)), notice: I18n.t('admin.instances.moderation_notes.created_msg')
     else
       @instance_moderation_notes = @instance.moderation_notes.includes(:account).chronological
-      @time_period = (6.days.ago.to_date...Time.now.utc.to_date)
+      @time_period = (6.days.ago.to_date..Time.now.utc.to_date)
       @action_logs = Admin::ActionLogFilter.new(target_domain: @instance.domain).results.limit(5)
 
       render 'admin/instances/show'
diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb
index 033d250a2e0..72024a73430 100644
--- a/app/controllers/admin/instances_controller.rb
+++ b/app/controllers/admin/instances_controller.rb
@@ -17,7 +17,7 @@ module Admin
 
       @instance_moderation_note = @instance.moderation_notes.new
       @instance_moderation_notes = @instance.moderation_notes.includes(:account).chronological
-      @time_period = (6.days.ago.to_date...Time.now.utc.to_date)
+      @time_period = (6.days.ago.to_date..Time.now.utc.to_date)
       @action_logs = Admin::ActionLogFilter.new(target_domain: @instance.domain).results.limit(LOGS_LIMIT)
     end
 
diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
index f2c28328f86..2d6bfbe35c4 100644
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@@ -38,7 +38,7 @@ module Admin
     end
 
     def report_range
-      (PERIOD_DAYS.ago.to_date...Time.now.utc.to_date)
+      (PERIOD_DAYS.ago.to_date..Time.now.utc.to_date)
     end
 
     def tag_params
diff --git a/app/lib/activity_tracker.rb b/app/lib/activity_tracker.rb
index d0e675f07d2..bdb520d7399 100644
--- a/app/lib/activity_tracker.rb
+++ b/app/lib/activity_tracker.rb
@@ -39,7 +39,7 @@ class ActivityTracker
   end
 
   def sum(start_at, end_at = Time.now.utc)
-    keys = (start_at.to_date...end_at.to_date).flat_map { |date| [key_at(date.to_time(:utc)), legacy_key_at(date)] }.uniq
+    keys = (start_at.to_date..end_at.to_date).flat_map { |date| [key_at(date.to_time(:utc)), legacy_key_at(date)] }.uniq
 
     case @type
     when :basic
diff --git a/app/lib/admin/metrics/measure/base_measure.rb b/app/lib/admin/metrics/measure/base_measure.rb
index 7a6bc219909..bf9816577c1 100644
--- a/app/lib/admin/metrics/measure/base_measure.rb
+++ b/app/lib/admin/metrics/measure/base_measure.rb
@@ -97,7 +97,7 @@ class Admin::Metrics::Measure::BaseMeasure
   end
 
   def previous_time_period
-    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
+    ((@start_at.to_date - (length_of_period + 1))..(@end_at.to_date - (length_of_period + 1)))
   end
 
   def length_of_period
diff --git a/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb b/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb
index b258455dabb..94d7054f479 100644
--- a/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb
@@ -17,6 +17,10 @@ RSpec.describe Admin::Metrics::Measure::TagUsesMeasure do
       let(:bob) { Fabricate(:account, domain: 'bob.example') }
 
       before do
+        2.times do
+          travel_to(3.days.ago) { add_tag_history(alice) }
+        end
+
         3.times do
           travel_to(2.days.ago) { add_tag_history(alice) }
         end
@@ -40,6 +44,8 @@ RSpec.describe Admin::Metrics::Measure::TagUsesMeasure do
             include(date: 1.day.ago.midnight.to_time, value: '4'),
             include(date: 0.days.ago.midnight.to_time, value: '1')
           )
+        expect(subject.previous_total)
+          .to eq 2
       end
 
       def add_tag_history(account)