diff --git a/unsloth/chat_templates.py b/unsloth/chat_templates.py
index 695ad49017..da46972750 100644
--- a/unsloth/chat_templates.py
+++ b/unsloth/chat_templates.py
@@ -245,8 +245,8 @@ CHAT_TEMPLATES["gemma"] = (gemma_template, gemma_eos_token,)
 # We find using <eos> is still more appropriate!
 gemma_chatml_template = "{{ bos_token }}" + chatml_template
 gemma_chatml_eos_token = (
-    {"<start_of_turn>" : "<|im_start|>", }, # "<end_of_turn>" : "<|im_end|>"},
-    "eos_token", # "<|im_end|>",
+    {"<start_of_turn>" : "<|im_start|>", "<eos>" : "<|im_end|>"},
+    "<|im_end|>",
 )
 CHAT_TEMPLATES["gemma_chatml"] = (gemma_chatml_template, gemma_chatml_eos_token,)