diff --git a/instruction-templates/Mistral.yaml b/instruction-templates/Mistral.yaml
index 0b6baf11..113c238b 100644
--- a/instruction-templates/Mistral.yaml
+++ b/instruction-templates/Mistral.yaml
@@ -4,13 +4,12 @@ instruction_template: |-
           {{- message['content'] -}}
       {%- else -%}
           {%- if message['role'] == 'user' -%}
-              {{-'[INST] ' + message['content'] + ' [/INST]'-}}
+              {{-' [INST] ' + message['content'].rstrip() + ' [/INST] '-}}
           {%- else -%}
-              {{-'' + message['content'] + '</s> ' -}}
+              {{-'' + message['content'] + '</s>' -}}
           {%- endif -%}
       {%- endif -%}
   {%- endfor -%}
   {%- if add_generation_prompt -%}
       {{-''-}}
-  {%- endif -%}
-
+  {%- endif -%}
\ No newline at end of file