diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
index 8f3fc7e45..cda2dce05 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
@@ -47,7 +47,7 @@
         )) ?>
     </span>
   <?php if (! $downtime->is_in_effect && $downtime->start >= time()): ?>
-    <span><?= sprintf($this->translate('expires %s'), $this->timeUntil($downtime->end, false, true)) ?></span>
+    <span><?= sprintf($this->translate('expires %s'), $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, false, true)) ?></span>
   <?php endif ?>
     <span class="comment-icons">
       <?php if ($downtime->is_flexible): ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 5d96080e9..72c506415 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -74,7 +74,7 @@ if (empty($object->comments) && ! $addLink) {
                     }
                     $state .= ' ' . sprintf(
                         $this->translate('expires %s', 'Last format parameter represents the downtime expire time'),
-                        $this->timeUntil($downtime->end, false, true)
+                        $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, false, true)
                     );
                 }
             }