diff --git a/haskell-completions.el b/haskell-completions.el
index 6484cb8f2..ffe50ff9c 100644
--- a/haskell-completions.el
+++ b/haskell-completions.el
@@ -296,7 +296,8 @@ PREFIX should be a list such one returned by
                ('haskell-completions-language-extension-prefix
                 haskell-ghc-supported-extensions)
                (otherwise
-                (append (tags-completion-table)
+                (append (when (bound-and-true-p haskell-tags-on-save)
+                          tags-completion-table)
                         haskell-completions--keywords)))))
         (list beg end candidates)))))