diff --git a/core/prelude-core.el b/core/prelude-core.el
index 353dbfa..42e12e9 100644
--- a/core/prelude-core.el
+++ b/core/prelude-core.el
@@ -405,7 +405,7 @@ Doesn't mess with special buffers."
 (defun prelude-tip-of-the-day ()
   "Display a random entry from `prelude-tips'."
   (interactive)
-  (unless (window-minibuffer-p)
+  (when (and prelude-tips (not (window-minibuffer-p)))
     ;; pick a new random seed
     (random t)
     (message