diff --git a/org-clock-waybar.el b/org-clock-waybar.el
index 31cff71..d15e82d 100644
--- a/org-clock-waybar.el
+++ b/org-clock-waybar.el
@@ -84,9 +84,9 @@
 (defun org-clock-waybar--get-tags ()
   "Get the tags of the currently clocked-in task."
   (when (org-clocking-p)
-    (save-window-excursion
-      (org-clock-goto)
-      (org-get-tags))))
+    (or (org-with-point-at org-clock-marker (org-get-tags))
+        "")
+    ))
 
 (defun org-clock-waybar--get-clocked-task-json ()
   "Get the currently clocked-in task’s data as a stringified JSON object.