diff --git a/assets/js/components/Config/MessagingModal.vue b/assets/js/components/Config/MessagingModal.vue
index 32747b4c3..12b225aab 100644
--- a/assets/js/components/Config/MessagingModal.vue
+++ b/assets/js/components/Config/MessagingModal.vue
@@ -6,6 +6,7 @@
 		docs="/docs/reference/configuration/messaging"
 		:defaultYaml="defaultYaml"
 		endpoint="/config/messaging"
+		data-testid="messaging-modal"
 		@changed="$emit('changed')"
 	/>
 </template>
diff --git a/server/http.go b/server/http.go
index c9b933250..4a1b9ebe2 100644
--- a/server/http.go
+++ b/server/http.go
@@ -245,12 +245,12 @@ func (s *HTTPd) RegisterSystemHandler(valueChan chan<- util.Param, cache *util.C
 
 		// yaml handlers
 		for key, fun := range map[string]func() (any, any){
-			keys.EEBus:       func() (any, any) { return new(map[string]any), eebus.Config{} },
-			keys.Hems:        func() (any, any) { return new(map[string]any), config.Typed{} },
-			keys.Tariffs:     func() (any, any) { return new(map[string]any), globalconfig.Tariffs{} },
-			keys.Messaging:   func() (any, any) { return new(map[string]any), globalconfig.Messaging{} },       // has default
-			keys.ModbusProxy: func() (any, any) { return new([]map[string]any), []globalconfig.ModbusProxy{} }, // slice
-			keys.Circuits:    func() (any, any) { return new([]map[string]any), []config.Named{} },             // slice
+			keys.EEBus:       func() (any, any) { return map[string]any{}, eebus.Config{} },
+			keys.Hems:        func() (any, any) { return map[string]any{}, config.Typed{} },
+			keys.Tariffs:     func() (any, any) { return map[string]any{}, globalconfig.Tariffs{} },
+			keys.Messaging:   func() (any, any) { return map[string]any{}, globalconfig.Messaging{} },       // has default
+			keys.ModbusProxy: func() (any, any) { return []map[string]any{}, []globalconfig.ModbusProxy{} }, // slice
+			keys.Circuits:    func() (any, any) { return []map[string]any{}, []config.Named{} },             // slice
 		} {
 			other, struc := fun()
 			routes[key] = route{Method: "GET", Pattern: "/" + key, HandlerFunc: settingsGetStringHandler(key)}
diff --git a/tests/config-messaging.spec.js b/tests/config-messaging.spec.js
new file mode 100644
index 000000000..0543cdb89
--- /dev/null
+++ b/tests/config-messaging.spec.js
@@ -0,0 +1,60 @@
+import { test, expect } from "@playwright/test";
+import { start, stop, baseUrl } from "./evcc";
+
+const CONFIG_GRID_ONLY = "config-grid-only.evcc.yaml";
+
+test.use({ baseURL: baseUrl() });
+
+test.afterEach(async () => {
+  await stop();
+});
+
+const SELECT_ALL = "ControlOrMeta+KeyA";
+
+async function login(page) {
+  await page.locator("#loginPassword").fill("secret");
+  await page.getByRole("button", { name: "Login" }).click();
+  await expect(page.locator("#loginPassword")).not.toBeVisible();
+}
+
+async function enableExperimental(page) {
+  await page
+    .getByTestId("generalconfig-experimental")
+    .getByRole("button", { name: "edit" })
+    .click();
+  await page.getByLabel("Experimental 🧪").click();
+  await page.getByRole("button", { name: "Close" }).click();
+  await expect(page.locator(".modal-backdrop")).not.toBeVisible();
+}
+
+async function goToConfig(page) {
+  await page.goto("/#/config");
+  await login(page);
+  await enableExperimental(page);
+}
+
+test.describe("messaging", async () => {
+  test("save a comment", async ({ page }) => {
+    await start(CONFIG_GRID_ONLY, "password.sql");
+    await goToConfig(page);
+
+    await page.getByTestId("messaging").getByRole("button", { name: "edit" }).click();
+    const modal = await page.getByTestId("messaging-modal");
+    await expect(modal).toBeVisible();
+
+    await modal.locator(".monaco-editor .view-line").nth(0).click();
+    for (let i = 0; i < 4; i++) {
+      await page.keyboard.press(SELECT_ALL);
+      await page.keyboard.press("Backspace");
+    }
+    await page.keyboard.type("# hello world");
+    await page.getByRole("button", { name: "Save" }).click();
+    await expect(modal).not.toBeVisible();
+
+    page.reload();
+
+    await page.getByTestId("messaging").getByRole("button", { name: "edit" }).click();
+    await expect(modal).toBeVisible();
+    await expect(modal).toContainText("# hello world");
+  });
+});