diff --git a/core/core-cli-lib.el b/core/core-cli-lib.el
index eda5acbad..e4ca7aaf3 100644
--- a/core/core-cli-lib.el
+++ b/core/core-cli-lib.el
@@ -764,6 +764,7 @@ executable context."
 
          ((when-let*
               (((null arguments))
+               ((not rest?))
                (command (append (doom-cli--command context) (list arg)))
                (cli  (doom-cli-get command t))
                (rcli (doom-cli-get command))
@@ -784,7 +785,7 @@ executable context."
                     (setf (map-elt (doom-cli-context-options context) switch)
                           nil)))))
             (when (and (doom-cli-fn rcli)
-                       (alist-get '&rest (doom-cli-arguments cli)))
+                       (alist-get '&rest (doom-cli-arguments rcli)))
               (setq rest? t))
             t))