diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el
index 133bf4e..2a27e45 100644
--- a/.emacs.d/site-lisp/oni.el
+++ b/.emacs.d/site-lisp/oni.el
@@ -381,7 +381,8 @@ When dealing with braces, add another line and indent that too."
 (defun oni:org-mode-func ()
   "Function for `org-mode-hook'."
   (auto-fill-mode)
-  (yas-minor-mode))
+  (yas-minor-mode)
+  (setq-local comment-auto-fill-only-comments nil))
 
 (defun oni:php-mode-func ()
   "Function for `php-mode-hook'."