diff --git a/assets/components/LogViewer/EventSource.spec.ts b/assets/components/LogViewer/EventSource.spec.ts
index 55240280..49bbbfac 100644
--- a/assets/components/LogViewer/EventSource.spec.ts
+++ b/assets/components/LogViewer/EventSource.spec.ts
@@ -138,7 +138,7 @@ describe("<ContainerEventSource />", () => {
     const wrapper = createLogEventSource();
     sources[sourceUrl].emitOpen();
     sources[sourceUrl].emitMessage({
-      data: `{"ts":1560336942459, "m":"This is a message.", "id":1}`,
+      data: `{"ts":1560336942459, "m":"This is a message.", "id":1, "rm": "This is a message."}`,
     });
 
     vi.runAllTimers();
@@ -154,7 +154,7 @@ describe("<ContainerEventSource />", () => {
       const wrapper = createLogEventSource();
       sources[sourceUrl].emitOpen();
       sources[sourceUrl].emitMessage({
-        data: `{"ts":1560336942459, "m":"This is a message.", "id":1}`,
+        data: `{"ts":1560336942459, "m":"This is a message.", "id":1, "rm": "This is a message."}`,
       });
 
       vi.runAllTimers();
@@ -167,7 +167,7 @@ describe("<ContainerEventSource />", () => {
       const wrapper = createLogEventSource({ hourStyle: "12" });
       sources[sourceUrl].emitOpen();
       sources[sourceUrl].emitMessage({
-        data: `{"ts":1560336942459, "m":"foo bar", "id":1}`,
+        data: `{"ts":1560336942459, "m":"foo bar", "id":1, "rm": "foo bar"}`,
       });
 
       vi.runAllTimers();
diff --git a/assets/components/LogViewer/LogDetails.vue b/assets/components/LogViewer/LogDetails.vue
index e3455569..69011721 100644
--- a/assets/components/LogViewer/LogDetails.vue
+++ b/assets/components/LogViewer/LogDetails.vue
@@ -29,7 +29,7 @@
       <div class="flex gap-2">
         Raw JSON
 
-        <UseClipboard v-slot="{ copy, copied }" :source="JSON.stringify(entry.unfilteredMessage)">
+        <UseClipboard v-slot="{ copy, copied }" :source="entry.rawMessage">
           <button class="swap outline-hidden" @click="copy()" :class="{ 'hover:swap-active': copied }">
             <mdi:check class="swap-on" />
             <mdi:content-copy class="swap-off" />
@@ -37,7 +37,7 @@
         </UseClipboard>
       </div>
       <div class="bg-base-200 max-h-48 overflow-scroll rounded-sm border border-white/20 p-2">
-        <pre v-html="syntaxHighlight(entry.unfilteredMessage)"></pre>
+        <pre v-html="syntaxHighlight(entry.rawMessage)"></pre>
       </div>
     </section>
     <table class="table-pin-rows table table-fixed" v-if="entry instanceof ComplexLogEntry">
@@ -59,7 +59,7 @@
             {{ key.join(".") }}
           </td>
           <td class="truncate max-md:hidden">
-            <code v-html="JSON.stringify(value)"></code>
+            <code>{{ JSON.stringify(value) }}</code>
           </td>
           <td>
             <input type="checkbox" class="toggle toggle-primary" :checked="enabled" @change="toggleField(key)" />
@@ -96,14 +96,15 @@ function toggleField(key: string[]) {
 const fields = computed({
   get() {
     const fieldsWithValue: { key: string[]; value: any; enabled: boolean }[] = [];
-    const allFields = flattenJSONToMap(entry.unfilteredMessage);
+    const rawFields = JSON.parse(entry.rawMessage);
+    const allFields = flattenJSONToMap(rawFields);
     if (visibleKeys.value.size === 0) {
       for (const [key, value] of allFields) {
         fieldsWithValue.push({ key, value, enabled: true });
       }
     } else {
       for (const [key, enabled] of visibleKeys.value) {
-        const value = getDeep(entry.unfilteredMessage, key);
+        const value = getDeep(rawFields, key);
         fieldsWithValue.push({ key, value, enabled });
       }
 
@@ -141,8 +142,8 @@ const toggleAllFields = computed({
   },
 });
 
-function syntaxHighlight(json: any) {
-  json = JSON.stringify(json, null, 2);
+function syntaxHighlight(json: string) {
+  json = JSON.stringify(JSON.parse(json.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")), null, 2);
   return json.replace(
     /("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|\b\d+\b)/g,
     function (match: string) {
diff --git a/assets/components/LogViewer/SimpleLogItem.vue b/assets/components/LogViewer/SimpleLogItem.vue
index 78c48a4a..47aec7dd 100644
--- a/assets/components/LogViewer/SimpleLogItem.vue
+++ b/assets/components/LogViewer/SimpleLogItem.vue
@@ -6,14 +6,13 @@
     ></div>
     <LogMessageActions
       class="absolute -right-1 opacity-0 transition-opacity delay-150 duration-250 group-hover/entry:opacity-100"
-      :message="() => decodeXML(stripAnsi(logEntry.message))"
+      :message="() => stripAnsi(logEntry.rawMessage)"
       :log-entry="logEntry"
     />
   </LogItem>
 </template>
 <script lang="ts" setup>
 import { SimpleLogEntry } from "@/models/LogEntry";
-import { decodeXML } from "entities";
 import AnsiConvertor from "ansi-to-html";
 import stripAnsi from "strip-ansi";
 
diff --git a/assets/components/LogViewer/__snapshots__/EventSource.spec.ts.snap b/assets/components/LogViewer/__snapshots__/EventSource.spec.ts.snap
index 4fb3d3fc..ffc41b5b 100644
--- a/assets/components/LogViewer/__snapshots__/EventSource.spec.ts.snap
+++ b/assets/components/LogViewer/__snapshots__/EventSource.spec.ts.snap
@@ -74,6 +74,7 @@ SimpleLogEntry {
   "id": 1,
   "level": undefined,
   "position": undefined,
+  "rawMessage": "This is a message.",
   "std": "stderr",
 }
 `;
diff --git a/assets/models/LogEntry.ts b/assets/models/LogEntry.ts
index 0bdd9e6e..510b1b91 100644
--- a/assets/models/LogEntry.ts
+++ b/assets/models/LogEntry.ts
@@ -28,6 +28,7 @@ export interface LogEvent {
   readonly p: Position;
   readonly s: "stdout" | "stderr" | "unknown";
   readonly c: string;
+  readonly rm: string;
 }
 
 export abstract class LogEntry<T extends string | JSONObject> {
@@ -38,6 +39,7 @@ export abstract class LogEntry<T extends string | JSONObject> {
     public readonly id: number,
     public readonly date: Date,
     public readonly std: Std,
+    public readonly rawMessage: string,
     public readonly level?: Level,
   ) {
     this._message = message;
@@ -59,8 +61,9 @@ export class SimpleLogEntry extends LogEntry<string> {
     public readonly level: Level,
     public readonly position: Position,
     public readonly std: Std,
+    public readonly rawMessage: string,
   ) {
-    super(message, containerID, id, date, std, level);
+    super(message, containerID, id, date, std, rawMessage, level);
   }
   getComponent(): Component {
     return SimpleLogItem;
@@ -77,9 +80,10 @@ export class ComplexLogEntry extends LogEntry<JSONObject> {
     date: Date,
     public readonly level: Level,
     public readonly std: Std,
+    public readonly rawMessage: string,
     visibleKeys?: Ref<Map<string[], boolean>>,
   ) {
-    super(message, containerID, id, date, std, level);
+    super(message, containerID, id, date, std, rawMessage, level);
     if (visibleKeys) {
       this.filteredMessage = computed(() => {
         if (visibleKeys.value.size === 0) {
@@ -123,6 +127,7 @@ export class ComplexLogEntry extends LogEntry<JSONObject> {
       event.date,
       event.level,
       event.std,
+      event.rawMessage,
       visibleKeys,
     );
   }
@@ -187,6 +192,7 @@ export function asLogEntry(event: LogEvent): LogEntry<string | JSONObject> {
       new Date(event.ts),
       event.l,
       event.s === "unknown" ? "stderr" : (event.s ?? "stderr"),
+      event.rm,
     );
   } else {
     return new SimpleLogEntry(
@@ -197,6 +203,7 @@ export function asLogEntry(event: LogEvent): LogEntry<string | JSONObject> {
       event.l,
       event.p,
       event.s === "unknown" ? "stderr" : (event.s ?? "stderr"),
+      event.rm,
     );
   }
 }
diff --git a/assets/pages/settings.vue b/assets/pages/settings.vue
index c59026c5..f0dff285 100644
--- a/assets/pages/settings.vue
+++ b/assets/pages/settings.vue
@@ -181,8 +181,8 @@ const hoursAgo = (hours: number) => {
 const fakeMessages = computedWithControl(
   () => i18n.global.locale.value,
   () => [
-    new SimpleLogEntry(t("settings.log.preview"), "123", 1, hoursAgo(16), "info", undefined, "stdout"),
-    new SimpleLogEntry(t("settings.log.warning"), "123", 2, hoursAgo(12), "warn", undefined, "stdout"),
+    new SimpleLogEntry(t("settings.log.preview"), "123", 1, hoursAgo(16), "info", undefined, "stdout", ""),
+    new SimpleLogEntry(t("settings.log.warning"), "123", 2, hoursAgo(12), "warn", undefined, "stdout", ""),
     new SimpleLogEntry(
       t("settings.log.multi-line-error.start-line"),
       "123",
@@ -191,6 +191,7 @@ const fakeMessages = computedWithControl(
       "error",
       "start",
       "stderr",
+      "",
     ),
     new SimpleLogEntry(
       t("settings.log.multi-line-error.middle-line"),
@@ -200,8 +201,9 @@ const fakeMessages = computedWithControl(
       "error",
       "middle",
       "stderr",
+      "",
     ),
-    new SimpleLogEntry(t("settings.log.multi-line-error.end-line"), "123", 5, new Date(), "error", "end", "stderr"),
+    new SimpleLogEntry(t("settings.log.multi-line-error.end-line"), "123", 5, new Date(), "error", "end", "stderr", ""),
     new ComplexLogEntry(
       {
         message: t("settings.log.complex"),
@@ -215,8 +217,9 @@ const fakeMessages = computedWithControl(
       new Date(),
       "info",
       "stdout",
+      "",
     ),
-    new SimpleLogEntry(t("settings.log.simple"), "123", 7, new Date(), "debug", undefined, "stderr"),
+    new SimpleLogEntry(t("settings.log.simple"), "123", 7, new Date(), "debug", undefined, "stderr", ""),
   ],
 );
 </script>
diff --git a/internal/container/event_generator.go b/internal/container/event_generator.go
index 85b0c54f..6553b5c8 100644
--- a/internal/container/event_generator.go
+++ b/internal/container/event_generator.go
@@ -124,6 +124,7 @@ func createEvent(message string, streamType StdType) *LogEvent {
 			logEvent.Timestamp = timestamp.UnixMilli()
 			message = strings.TrimSuffix(message[index+1:], "\n")
 			logEvent.Message = message
+			logEvent.RawMessage = message
 			if message == "" {
 				logEvent.Message = "" // empty message so do nothing
 			} else if json.Valid([]byte(message)) {
diff --git a/internal/container/types.go b/internal/container/types.go
index 17ac3a06..d1592ed4 100644
--- a/internal/container/types.go
+++ b/internal/container/types.go
@@ -167,6 +167,7 @@ func ParseContainerAction(input string) (ContainerAction, error) {
 
 type LogEvent struct {
 	Message     any         `json:"m,omitempty"`
+	RawMessage  string      `json:"rm,omitempty"`
 	Timestamp   int64       `json:"ts"`
 	Id          uint32      `json:"id,omitempty"`
 	Level       string      `json:"l,omitempty"`
diff --git a/internal/web/__snapshots__/web.snapshot b/internal/web/__snapshots__/web.snapshot
index d406dc89..7e3f13dd 100644
--- a/internal/web/__snapshots__/web.snapshot
+++ b/internal/web/__snapshots__/web.snapshot
@@ -81,15 +81,18 @@ Content-Type: text/html
 <pre>dev</pre>
 
 /* snapshot: Test_handler_between_dates */
-{"m":"INFO Testing stdout logs...","ts":1589396137772,"id":466600245,"l":"info","s":"stdout","c":"123456"}
-{"m":"INFO Testing stderr logs...","ts":1589396197772,"id":1101501603,"l":"info","s":"stderr","c":"123456"}
+{"m":"INFO Testing stdout logs...","rm":"INFO Testing stdout logs...","ts":1589396137772,"id":466600245,"l":"info","s":"stdout","c":"123456"}
+{"m":"INFO Testing stderr logs...","rm":"INFO Testing stderr logs...","ts":1589396197772,"id":1101501603,"l":"info","s":"stderr","c":"123456"}
+
 
 /* snapshot: Test_handler_between_dates_with_everything_complex */
-{"m":{"msg":"a complex log message"},"ts":1589396197772,"id":62280847,"l":"unknown","s":"stdout","c":"123456"}
+{"m":{"msg":"a complex log message"},"rm":"{\"msg\":\"a complex log message\"}","ts":1589396197772,"id":62280847,"l":"unknown","s":"stdout","c":"123456"}
+
 
 /* snapshot: Test_handler_between_dates_with_fill */
-{"m":"INFO Testing stdout logs...","ts":1589396137772,"id":466600245,"l":"info","s":"stdout","c":"123456"}
-{"m":"INFO Testing stderr logs...","ts":1589396197772,"id":1101501603,"l":"info","s":"stderr","c":"123456"}
+{"m":"INFO Testing stdout logs...","rm":"INFO Testing stdout logs...","ts":1589396137772,"id":466600245,"l":"info","s":"stdout","c":"123456"}
+{"m":"INFO Testing stderr logs...","rm":"INFO Testing stderr logs...","ts":1589396197772,"id":1101501603,"l":"info","s":"stderr","c":"123456"}
+
 
 /* snapshot: Test_handler_download_logs */
 INFO Testing logs...
@@ -179,7 +182,7 @@ data: {"name":"container-stopped","host":"localhost","actorId":"123456","time":"
 /* snapshot: Test_handler_streamLogs_happy_with_id */
 :ping 
 
-data: {"m":"INFO Testing logs...","ts":1589396137772,"id":1469707724,"l":"info","s":"stdout","c":"123456"}
+data: {"m":"INFO Testing logs...","rm":"INFO Testing logs...","ts":1589396137772,"id":1469707724,"l":"info","s":"stdout","c":"123456"}
 id: 1589396137772