diff --git a/src/services/Chromecast/Chromecast.js b/src/services/Chromecast/Chromecast.js
index 1bf82deb3..7d7c4b828 100644
--- a/src/services/Chromecast/Chromecast.js
+++ b/src/services/Chromecast/Chromecast.js
@@ -77,8 +77,7 @@ function Chromecast() {
         starting = false;
         onStateChanged();
         if (transport !== null) {
-            transport.off('init', onTransportInit);
-            transport.off('error', onTransportError);
+            transport.removeAllListeners();
             transport = null;
         }
     };
diff --git a/src/services/Core/Core.js b/src/services/Core/Core.js
index 1cba20016..9716cf2b3 100644
--- a/src/services/Core/Core.js
+++ b/src/services/Core/Core.js
@@ -77,8 +77,7 @@ function Core() {
         starting = false;
         onStateChanged();
         if (transport !== null) {
-            transport.off('init', onTransportInit);
-            transport.off('error', onTransportError);
+            transport.removeAllListeners();
             transport = null;
         }
     };