diff --git a/lisp/org-element.el b/lisp/org-element.el
index 4c61af6a2..6f648ed95 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -3562,10 +3562,13 @@ CONTENTS is nil."
 	      (and hour-start minute-start)
 	      (and time-range-p hour-end)
 	      (and time-range-p minute-end)
-	      (concat (case (org-element-property :repeater-type timestamp)
-			(cumulate "+") (catch-up "++") (restart ".+"))
-		      (org-element-property :repeater-value timestamp)
-		      (org-element-property :repeater-unit timestamp)))))
+	      (concat
+	       (case (org-element-property :repeater-type timestamp)
+		 (cumulate "+") (catch-up "++") (restart ".+"))
+	       (let ((val (org-element-property :repeater-value timestamp)))
+		 (and val (number-to-string val)))
+	       (case (org-element-property :repeater-unit timestamp)
+		 (hour "h") (day "d") (week "w") (month "m") (year "y"))))))
 	  ((active-range inactive-range)
 	   (let ((minute-start (org-element-property :minute-start timestamp))
 		 (minute-end (org-element-property :minute-end timestamp))
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index 6069260d8..a00e9d961 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -2251,7 +2251,8 @@ DEADLINE: <2012-01-01> SCHEDULED: <2012-01-01> CLOSED: [2012-01-01]\n"))))
     (org-element-timestamp-interpreter
      '(timestamp
        (:type active :year-start 2012 :month-start 3 :day-start 29
-	      :repeater-type cumulate :repeater-value "1y")) nil))))
+	      :repeater-type cumulate :repeater-value 1 :repeater-unit year))
+     nil))))
 
 (ert-deftest test-org-element/verse-block-interpreter ()
   "Test verse block interpretation."