From 8624da51f82be598384a4f8375e96b1d2b0bcccf Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Sun, 16 Feb 2025 16:13:00 +1100
Subject: [PATCH] Fix listenerOff issue.

---
 v2/internal/frontend/runtime/desktop/events.js | 2 ++
 website/src/pages/changelog.mdx                | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/v2/internal/frontend/runtime/desktop/events.js b/v2/internal/frontend/runtime/desktop/events.js
index 619ff5f06..321ae0f09 100644
--- a/v2/internal/frontend/runtime/desktop/events.js
+++ b/v2/internal/frontend/runtime/desktop/events.js
@@ -202,6 +202,8 @@ export function EventsOff(eventName, ...additionalEventNames) {
  */
  function listenerOff(listener) {
     const eventName = listener.eventName;
+    if (eventListeners[eventName] === undefined) return;
+
     // Remove local listener
     eventListeners[eventName] = eventListeners[eventName].filter(l => l !== listener);
 
diff --git a/website/src/pages/changelog.mdx b/website/src/pages/changelog.mdx
index 2a73c7a17..84e358285 100644
--- a/website/src/pages/changelog.mdx
+++ b/website/src/pages/changelog.mdx
@@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Fixed [listenerOff issue](https://github.com/wailsapp/wails/issues/3850) by @leaanthony.
+
 ## v2.10 - 2025-02-15
 
 ### Added