diff --git a/addon/components/tether-tooltip-and-popover.js b/addon/components/tether-tooltip-and-popover.js index 39297784..8df2af78 100644 --- a/addon/components/tether-tooltip-and-popover.js +++ b/addon/components/tether-tooltip-and-popover.js @@ -482,10 +482,13 @@ export default EmberTetherComponent.extend({ stopTether() { run.schedule('afterRender', () => { - // can't depend on `_tether.enabled` because it's not an - // Ember property (so won't trigger cp update when changed) - this.set('_isTetherEnabled', false); - this.get('_tether').disable(); + if (!this.isDestroyed && !this.isDestroying) { + + // can't depend on `_tether.enabled` because it's not an + // Ember property (so won't trigger cp update when changed) + this.set('_isTetherEnabled', false); + this.get('_tether').disable(); + } }); },