diff --git a/modules/prelude-erc.el b/modules/prelude-erc.el
index 717dffc..995929f 100644
--- a/modules/prelude-erc.el
+++ b/modules/prelude-erc.el
@@ -66,8 +66,9 @@
     (mkdir erc-log-channels-directory t))
 
 (setq erc-save-buffer-on-part t)
-(defadvice save-buffers-kill-emacs (before save-logs (arg) activate)
-  (save-some-buffers t (lambda () (when (eq major-mode 'erc-mode) t))))
+;; FIXME - this advice is wrong and is causing problems on Emacs exit
+;; (defadvice save-buffers-kill-emacs (before save-logs (arg) activate)
+;;   (save-some-buffers t (lambda () (when (eq major-mode 'erc-mode) t))))
 
 ;; truncate long irc buffers
 (erc-truncate-mode +1)