diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 55540276e..3f5226042 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -161,7 +161,8 @@ With prefix arg STOP, stop it entirely."
   (interactive)
   (run-hooks 'org-timer-stop-hook)
   (setq org-timer-start-time nil
-	org-timer-pause-time nil)
+	org-timer-pause-time nil
+	org-timer-current-timer nil)
   (org-timer-set-mode-line 'off)
   (message "Timer stopped"))