diff --git a/layers/+emacs/org/packages.el b/layers/+emacs/org/packages.el
index 8c2289178391..d18dd826870b 100644
--- a/layers/+emacs/org/packages.el
+++ b/layers/+emacs/org/packages.el
@@ -399,7 +399,10 @@ Will work on both org-mode and any mode that accepts plain html."
       "aof" "feeds"
       "aoC" (org-clocks-prefix))
     ;; org-agenda
-    (when (configuration-layer/layer-used-p 'ivy)
+    (unless (when-let ((pkg (configuration-layer/get-package 'helm-org-rifle)))
+              ;; TODO: `configuration-layer/package-used-p' doesn't check
+              ;; :toggle status.  When it is fixed, we can use it again.
+              (cfgl-package-used-p pkg))
       (spacemacs/set-leader-keys "ao/" 'org-occur-in-agenda-files))
     (spacemacs/set-leader-keys
       "ao#" 'org-agenda-list-stuck-projects