diff --git a/llms/mlx_lm/generate.py b/llms/mlx_lm/generate.py
index 54f6f4d2..f37037b6 100644
--- a/llms/mlx_lm/generate.py
+++ b/llms/mlx_lm/generate.py
@@ -171,7 +171,7 @@ def main():
     if args.use_default_chat_template:
         if tokenizer.chat_template is None:
             tokenizer.chat_template = tokenizer.default_chat_template
-    elif tokenizer.chat_template is None:
+    elif cache_history is not None:
         tokenizer.chat_template = metadata["chat_template"]
 
     if not args.ignore_chat_template and (
diff --git a/llms/mlx_lm/version.py b/llms/mlx_lm/version.py
index 87e86846..a2eb9a25 100644
--- a/llms/mlx_lm/version.py
+++ b/llms/mlx_lm/version.py
@@ -1,3 +1,3 @@
 # Copyright © 2023-2024 Apple Inc.
 
-__version__ = "0.18.0"
+__version__ = "0.18.1"