diff --git a/modules/lang/org/contrib/roam.el b/modules/lang/org/contrib/roam.el
index bf16eb894..961ea9b75 100644
--- a/modules/lang/org/contrib/roam.el
+++ b/modules/lang/org/contrib/roam.el
@@ -2,7 +2,17 @@
 ;;;###if (featurep! +roam)
 
 (use-package! org-roam
-  :after org
+  :hook (org-load . org-roam-mode)
+  :commands (org-roam
+             org-roam-capture
+             org-roam-date
+             org-roam-find-file
+             org-roam-graph-show
+             org-roam-insert
+             org-roam-switch-to-buffer
+             org-roam-today
+             org-roam-tomorrow
+             org-roam-yesterday)
   :preface
   ;; Set this to nil so we can later detect whether the user has set a custom
   ;; directory for it, and default to `org-directory' if they haven't.
@@ -24,8 +34,7 @@
           :desc "Yesterday"      "y" #'org-roam-yesterday))
   :config
   (unless org-roam-directory
-    (setq org-roam-directory org-directory))
-  (org-roam-mode +1))
+    (setq org-roam-directory org-directory)))
 
 
 ;; Since the org module lazy loads org-protocol (waits until an org URL is