diff --git a/users/glittershark/emacs.d/config.el b/users/glittershark/emacs.d/config.el
index f584e8c89..e7ec40035 100644
--- a/users/glittershark/emacs.d/config.el
+++ b/users/glittershark/emacs.d/config.el
@@ -602,7 +602,7 @@
         (format "gs/ch%d/%s" story-id desc))))
 
   (defun magit-read-org-clubhouse-branch-args ()
-    (if (org-clubhouse-clocked-in-story-id)
+    (if-let ((story-id (org-clubhouse-clocked-in-story-id)))
         (let ((start-point (magit-read-starting-point
                             "Create and checkout branch for Clubhouse story"
                             nil