From 558db89e4075c8a8829eb66d36ce5990e40a5231 Mon Sep 17 00:00:00 2001
From: Ihor Radchenko <yantar92@posteo.net>
Date: Tue, 10 Oct 2023 18:42:11 +0300
Subject: [PATCH] Backport 7cc208af9 fix from main

---
 lisp/org-agenda.el | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 38e81d9d7..670116304 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6321,6 +6321,11 @@ specification like [h]h:mm."
         (org-element-cache-map
          (lambda (el)
            (when (and (org-element-property :deadline el)
+                      ;; Only consider active timestamp values.
+                      (memq (org-element-property
+                             :type
+                             (org-element-property :deadline el))
+                            '(diary active active-range))
                       (or (not with-hour)
                           (org-element-property
                            :hour-start
@@ -6662,6 +6667,11 @@ scheduled items with an hour specification like [h]h:mm."
         (org-element-cache-map
          (lambda (el)
            (when (and (org-element-property :scheduled el)
+                      ;; Only consider active timestamp values.
+                      (memq (org-element-property
+                             :type
+                             (org-element-property :scheduled el))
+                            '(diary active active-range))
                       (or (not with-hour)
                           (org-element-property
                            :hour-start