diff --git a/recipes/inference/vllm/template_chatml.jinja b/recipes/inference/vllm/template_chatml.jinja
index 6bae1bb..0989fef 100644
--- a/recipes/inference/vllm/template_chatml.jinja
+++ b/recipes/inference/vllm/template_chatml.jinja
@@ -1,6 +1,5 @@
 {% for message in messages %}
-{% if loop.first and messages[0]['role'] != 'system' %}{{ '<|im_start|>system\nYou are a helpful assistant<|im_end|>\n' }}{% endif %}
-{{'<|im_start|>' + message['role'] + '\n' + message['content']}}
-{% if (loop.last and add_generation_prompt) or not loop.last %}{{ '<|im_end|>' + '\n'}}{% endif %}
+{% if loop.first and message['role'] != 'system' %}{{ '<|im_start|>system\nYou are a helpful assistant.<|im_end|>\n' }}{% endif %}
+{{ '<|im_start|>' + message['role'] + '\n' + message['content'] + '<|im_end|>\n' }}
+{% if loop.last and add_generation_prompt %}{{ '<|im_start|>assistant\n' }}{% endif %}
 {% endfor %}
-{% if add_generation_prompt and messages[-1]['role'] != 'assistant' %}{{ '<|im_start|>assistant\n' }}{% endif %}
\ No newline at end of file