diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php
index 89e3886f96e2c564b67750dc263863f54684080a..8e477f236359e717d0fdf3b5587aa6b1e1e6b9af 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php
@@ -128,7 +128,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
       '#description' => $this->t('How many time interval units should be shown in the formatted output.'),
       '#default_value' => $this->getSetting('granularity') ?: 2,
       '#min' => 1,
-      '#max' => 6,
+      '#max' => 7,
     ];
 
     return $form;
@@ -140,8 +140,8 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
   public function settingsSummary() {
     $summary = parent::settingsSummary();
 
-    $future_date = new DrupalDateTime('1 year 1 month 1 week 1 day 1 hour 1 minute');
-    $past_date = new DrupalDateTime('-1 year -1 month -1 week -1 day -1 hour -1 minute');
+    $future_date = new DrupalDateTime('1 year 1 month 1 week 1 day 1 hour 1 minute 1 second');
+    $past_date = new DrupalDateTime('-1 year -1 month -1 week -1 day -1 hour -1 minute -1 second');
     $granularity = $this->getSetting('granularity');
     $options = [
       'granularity' => $granularity,
diff --git a/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php b/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php
index d846586b4f2232b15d79dda18f140fd629996411..709115c6e61b68060e3a9be8e50cd9c66a46ff96 100644
--- a/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php
+++ b/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php
@@ -146,7 +146,7 @@ public function testTimestampFormatter() {
   public function testTimestampAgoFormatter() {
     $data = [];
 
-    foreach ([1, 2, 3, 4, 5, 6] as $granularity) {
+    foreach ([1, 2, 3, 4, 5, 6, 7] as $granularity) {
       $data[] = [
         'future_format' => '@interval hence',
         'past_format' => '@interval ago',