From 4738923be6c2c79eb75b5917119ccd3e7ea34166 Mon Sep 17 00:00:00 2001
From: Tim <tymmesyde@gmail.com>
Date: Sun, 17 Dec 2023 17:24:17 +0100
Subject: [PATCH] fix(App): core error handling was broken

---
 src/App/App.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/App/App.js b/src/App/App.js
index de443d9d4..d6e92fbbb 100644
--- a/src/App/App.js
+++ b/src/App/App.js
@@ -146,8 +146,10 @@ const App = () => {
                 .catch((e) => console.error(e));
         }
         return () => {
-            window.removeEventListener('focus', onWindowFocus);
-            services.core.transport.off('CoreEvent', onCoreEvent);
+            if (services.core.active) {
+                window.removeEventListener('focus', onWindowFocus);
+                services.core.transport.off('CoreEvent', onCoreEvent);
+            }
         };
     }, [initialized]);
     return (