diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index f5fee3460..9d0ef086a 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1440,7 +1440,7 @@ The time is always returned as UTC."
       (current-time))
      ((equal cmt "today")
       (setq org--msg-extra "showing today's task time.")
-      (let* ((dt (decode-time nil t))
+      (let* ((dt (org-decode-time nil t))
 	     (hour (nth 2 dt))
 	     (day (nth 3 dt)))
 	(if (< hour org-extend-today-until) (setf (nth 3 dt) (1- day)))
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 4aecee3ce..0e595c46e 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -61,6 +61,12 @@
   (defalias 'format-message 'format)
   (defalias 'gui-get-selection 'x-get-selection))
 
+(defun org-decode-time (&optional time zone)
+  "Backward-compatible function for `decode-time'."
+  (if (< emacs-major-version 25)
+      (decode-time time)
+    (decode-time time zone)))
+
 (unless (fboundp 'directory-name-p)
   (defun directory-name-p (name)
     "Return non-nil if NAME ends with a directory separator character."