diff --git a/ui-v2/app/components/data-sink/index.js b/ui-v2/app/components/data-sink/index.js
index 380527a13..c3e463d69 100644
--- a/ui-v2/app/components/data-sink/index.js
+++ b/ui-v2/app/components/data-sink/index.js
@@ -44,7 +44,7 @@ export default Component.extend({
     this._super(...arguments);
     this._listeners = this.dom.listeners();
   },
-  willDestroy: function() {
+  willDestroyElement: function() {
     this._super(...arguments);
     this._listeners.remove();
   },
diff --git a/ui-v2/app/components/data-source/index.js b/ui-v2/app/components/data-source/index.js
index 4a41d22c5..8ee8a796b 100644
--- a/ui-v2/app/components/data-source/index.js
+++ b/ui-v2/app/components/data-source/index.js
@@ -45,10 +45,11 @@ export default Component.extend({
     this._lazyListeners = this.dom.listeners();
     this.guid = this.dom.guid(this);
   },
-  willDestroy: function() {
+  willDestroyElement: function() {
     this.actions.close.apply(this);
     this._listeners.remove();
     this._lazyListeners.remove();
+    this._super(...arguments);
   },
 
   didInsertElement: function() {
diff --git a/ui-v2/app/components/jwt-source/index.js b/ui-v2/app/components/jwt-source/index.js
index da84dc672..c4da73b58 100644
--- a/ui-v2/app/components/jwt-source/index.js
+++ b/ui-v2/app/components/jwt-source/index.js
@@ -12,7 +12,7 @@ export default Component.extend({
     this._super(...arguments);
     this._listeners = this.dom.listeners();
   },
-  willDestroy: function() {
+  willDestroyElement: function() {
     this._super(...arguments);
     this.repo.close();
     this._listeners.remove();
diff --git a/ui-v2/app/components/state-chart/guard/index.js b/ui-v2/app/components/state-chart/guard/index.js
index 1eb060f5b..e5f650029 100644
--- a/ui-v2/app/components/state-chart/guard/index.js
+++ b/ui-v2/app/components/state-chart/guard/index.js
@@ -13,7 +13,7 @@ export default Component.extend({
       }
     });
   },
-  willDestroy: function() {
+  willDestroyElement: function() {
     this._super(...arguments);
     this.chart.removeGuard(this.name);
   },