diff --git a/llama_cpp/llama_chat_format.py b/llama_cpp/llama_chat_format.py
index e1a447550..cbfc95c5f 100644
--- a/llama_cpp/llama_chat_format.py
+++ b/llama_cpp/llama_chat_format.py
@@ -3773,7 +3773,8 @@ class Qwen3VLChatHandler(Llava15ChatHandler):
                 "{%- endif -%}"
             "{%- elif message.role == 'tool' -%}"
                 "{{- '</tool_response>' -}}"
-            "{%- elif message.role != 'system' -%}"
+            "{%- endif -%}"
+            "{%- if message.role != 'system' -%}"
                 "{{- '<|im_end|>\n' -}}"
             "{%- endif -%}"
         "{%- endfor -%}"