diff --git a/app/helpers/admin_general_timeline_helper.rb b/app/helpers/admin_general_timeline_helper.rb
index c6fa3d70ef..ae4cd3c608 100644
--- a/app/helpers/admin_general_timeline_helper.rb
+++ b/app/helpers/admin_general_timeline_helper.rb
@@ -13,8 +13,7 @@ def time_filters
       'Day' => 1.day.ago,
       '2 days' => 2.days.ago,
       'Week' => 1.week.ago,
-      'Month' => 1.month.ago,
-      'All time' => Time.utc(1970, 1, 1)
+      'Month' => 1.month.ago
     }
   end
 
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index f72aad51cd..914c3c565a 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -2,6 +2,8 @@
 
 ## Highlighted Features
 
+* Remove "All time" filter from admin timeline due to performance issues (Gareth
+  Rees)
 * Add example logrotate configuration (Graeme Porteous)
 * Switch application server from Thin to Puma (Graeme Porteous)
 * Fix rendering invoices page when there are discounted Pro subscription (Graeme