diff --git a/modules/email/notmuch/config.el b/modules/email/notmuch/config.el
index 931f58b1d..dd6b56ff5 100644
--- a/modules/email/notmuch/config.el
+++ b/modules/email/notmuch/config.el
@@ -15,7 +15,12 @@
 ;;
 ;;; Packages
 
-(after! notmuch
+(use-package! notmuch
+  :defer t
+  :init
+  (after! org
+    (add-to-list 'org-modules 'ol-notmuch))
+  :config
   (set-company-backend! 'notmuch-message-mode
     '(notmuch-company :with company-ispell company-yasnippet))