diff --git a/lisp/org-html.el b/lisp/org-html.el
index 312e716c4..9a5d2257f 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -1308,8 +1308,6 @@ lang=\"%s\" xml:lang=\"%s\">
 				  "@</a> ")
 			  t t line)))))
 
-	  (setq line (org-html-handle-time-stamps line))
-
 	  ;; replace "&" by "&amp;", "<" and ">" by "&lt;" and "&gt;"
 	  ;; handle @<..> HTML tags (replace "@&gt;..&lt;" by "<..>")
 	  ;; Also handle sub_superscripts and checkboxes
@@ -1474,6 +1472,8 @@ lang=\"%s\" xml:lang=\"%s\">
 	    (setq line (replace-match rpl t t line)
 		  start (+ start (length rpl))))
 
+	  (setq line (org-html-handle-time-stamps line))
+
 	  ;; TODO items
 	  (if (and (string-match org-todo-line-regexp line)
 		   (match-beginning 2))