diff --git a/modules/lang/org/README.org b/modules/lang/org/README.org
index a2eed2baa..83db0bb73 100644
--- a/modules/lang/org/README.org
+++ b/modules/lang/org/README.org
@@ -48,6 +48,8 @@ https://www.mfoot.com/blog/2015/11/22/literate-emacs-configuration-with-org-mode
 - +dragndrop ::
   Enable drag-and-drop support for images and files; inserts inline previews
   for images and an icon+link for other media types.
+- +crypt ::
+  Enable [[https://orgmode.org/manual/Org-Crypt.html][org-crypt]] integraiton for encryption and decryption on org files.
 - +gnuplot ::
   Install gnuplot & gnuplot-mode, which enables rendering images from gnuplot
   src blocks or plotting tables with fn:org-plot/gnuplot (bound to =SPC m b p=,
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 9869fd5c5..553fc5e1a 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -1143,8 +1143,8 @@ between the two."
         (set-marker p nil)))))
 
 
-;; TODO Move to +encrypt flag
 (use-package! org-crypt ; built-in
+  :when (modulep! +crypt)
   :commands org-encrypt-entries org-encrypt-entry org-decrypt-entries org-decrypt-entry
   :hook (org-reveal-start . org-decrypt-entry)
   :preface