diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el
index 8930d6d..46c87fb 100644
--- a/.emacs.d/site-lisp/oni.el
+++ b/.emacs.d/site-lisp/oni.el
@@ -68,8 +68,10 @@ DOT are intentionally being skipped."
   "Function for `after-save-hook'."
   (oni:compile-el)
   (executable-make-buffer-file-executable-if-script-p)
-  (let ((dom-dir (locate-dominating-file (buffer-file-name) "Makefile")))
-    (when dom-dir
+  (let* ((dom-dir (locate-dominating-file (buffer-file-name) "Makefile"))
+         (TAGSp (not (string= "" (shell-command-to-string
+                                  (concat "grep \"^TAGS:\" " dom-dir "Makefile"))))))
+    (when (and dom-dir TAGSp)
       (shell-command
        (concat "make -C " dom-dir " TAGS >/dev/null 2>&1")))))