diff --git a/assets/js/components/Config/Messaging/EventItem.vue b/assets/js/components/Config/Messaging/EventItem.vue
index d31c8e3f5..41e087967 100644
--- a/assets/js/components/Config/Messaging/EventItem.vue
+++ b/assets/js/components/Config/Messaging/EventItem.vue
@@ -51,7 +51,7 @@
 						:disabled="disabled"
 						:rows="3"
 						required
-						@change="updateMessage($event.target.value)"
+						@update:model-value="updateMessage"
 					/>
 					<div class="text-end small text-gray mt-1">
 						<a
diff --git a/assets/js/views/Config.vue b/assets/js/views/Config.vue
index e52ee64b7..cd50e4fda 100644
--- a/assets/js/views/Config.vue
+++ b/assets/js/views/Config.vue
@@ -698,7 +698,7 @@ export default defineComponent({
 		messagingUiConfigured() {
 			return (
 				this.messengers.length > 0 ||
-				Object.keys(store.state.messagingEvents ?? {}).length > 0
+				Object.values(store.state.messagingEvents ?? {}).some((e) => !e.disabled)
 			);
 		},
 	},
diff --git a/messenger/hub.go b/messenger/hub.go
index f1c2a32ca..a81d8e52a 100644
--- a/messenger/hub.go
+++ b/messenger/hub.go
@@ -54,7 +54,7 @@ func NewHub(cc globalconfig.MessagingEvents, vv Vehicles, cache *util.ParamCache
 	}
 
 	h := &Hub{
-		definitions: cc,
+		definitions: filtered,
 		cache:       cache,
 		vehicles:    vv,
 	}
diff --git a/tests/config-messaging.spec.ts b/tests/config-messaging.spec.ts
index 43ffb6b2a..38049c3d0 100644
--- a/tests/config-messaging.spec.ts
+++ b/tests/config-messaging.spec.ts
@@ -174,6 +174,6 @@ test.describe("messaging", async () => {
     await page.keyboard.press("Escape");
     await expectModalHidden(modal);
 
-    await expect(card).toContainText(["Events", "0", "Services", "0"].join(""));
+    await expect(card).toContainText(["Configured", "no"].join(""));
   });
 });