diff --git a/modules/completion/helm/config.el b/modules/completion/helm/config.el
index b56a5f921..1cced28f6 100644
--- a/modules/completion/helm/config.el
+++ b/modules/completion/helm/config.el
@@ -167,6 +167,17 @@ be negative.")
   (set-keymap-parent helm-generic-files-map helm-map))
 
 
+;;;###package helm-org
+(use-package! helm-org
+  :when (featurep! :lang org)
+  :defer t
+  :init
+  (after! helm
+    (pushnew! helm-completing-read-handlers-alist
+              '(org-capture . helm-org-completing-read-tags)
+              '(org-set-tags . helm-org-completing-read-tags))))
+
+
 ;;;###package helm-projectile
 (use-package! helm-projectile
   :commands (helm-projectile-find-file
diff --git a/modules/completion/helm/packages.el b/modules/completion/helm/packages.el
index 2021ecf93..10a3f8402 100644
--- a/modules/completion/helm/packages.el
+++ b/modules/completion/helm/packages.el
@@ -6,6 +6,7 @@
 (package! helm-c-yasnippet)
 (package! helm-company)
 (package! helm-describe-modes :recipe (:host github :repo "emacs-helm/helm-describe-modes"))
+(package! helm-org)
 (package! helm-projectile)
 (package! swiper-helm)
 (when (featurep! +fuzzy)
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index f91824e3d..07fdfe08e 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -916,13 +916,3 @@ compelling reason, so..."
       (org-clock-load))
     :config
     (add-hook 'kill-emacs-hook #'org-clock-save)))
-
-  (use-package! helm-org
-    :if (featurep! :completion helm)
-    :defer t
-    :init
-    (progn
-      (add-to-list 'helm-completing-read-handlers-alist
-                   '(org-capture . helm-org-completing-read-tags))
-      (add-to-list 'helm-completing-read-handlers-alist
-                   '(org-set-tags . helm-org-completing-read-tags))))
diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el
index ec130f039..db46d566e 100644
--- a/modules/lang/org/packages.el
+++ b/modules/lang/org/packages.el
@@ -36,8 +36,6 @@
   (package! ob-rust))
 
 ;;; Modules
-(when (featurep! :completion helm)
-  (package! helm-org))
 (when (featurep! +dragndrop)
   (package! org-download))
 (when (featurep! +gnuplot)