diff --git a/gpt4all-chat/CHANGELOG.md b/gpt4all-chat/CHANGELOG.md
index 3b1cf42f8d2b..85c6486cbecd 100644
--- a/gpt4all-chat/CHANGELOG.md
+++ b/gpt4all-chat/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
+## [Unreleased]
+
+### Fixed
+- Fix remote model template to allow for XML in messages ([#3318](https://github.com/nomic-ai/gpt4all/pull/3318))
+
 ## [3.5.3] - 2024-12-16
 
 ### Fixed
diff --git a/gpt4all-chat/src/modellist.cpp b/gpt4all-chat/src/modellist.cpp
index a6c5a620a070..23aa7dc48b0a 100644
--- a/gpt4all-chat/src/modellist.cpp
+++ b/gpt4all-chat/src/modellist.cpp
@@ -62,15 +62,15 @@ static const QString RMODEL_CHAT_TEMPLATE = uR"(<chat>
             {%- if loop.first %}
                 {{- '### Context:\n' }}
             {%- endif %}
-            {{- 'Collection: ' + source.collection + '\n'   +
-                'Path: '       + source.path       + '\n'   +
-                'Excerpt: '    + source.text       + '\n\n' }}
+            {{- ('Collection: ' + source.collection + '\n'    +
+                 'Path: '       + source.path       + '\n'    +
+                 'Excerpt: '    + source.text       + '\n\n') | escape }}
         {%- endfor %}
     {%- endif %}
     {%- for attachment in message.prompt_attachments %}
-        {{- attachment.processed_content + '\n\n' }}
+        {{- (attachment.processed_content + '\n\n') | escape }}
     {%- endfor %}
-    {{- message.content }}
+    {{- message.content | escape }}
     {{- '</' + message['role'] + '>' }}
 {%- endfor %}
 </chat>)"_s;