diff --git a/ember-infinity/src/components/infinity-loader.js b/ember-infinity/src/components/infinity-loader.js
index 3e2874f0..7affc138 100644
--- a/ember-infinity/src/components/infinity-loader.js
+++ b/ember-infinity/src/components/infinity-loader.js
@@ -177,7 +177,7 @@ export default class InfinityLoaderComponent extends Component {
     this._cancelTimers();
 
     this.infinityModelContent.then((infinityModel) => {
-      if (!this.isDestroyed) {
+      if (!this.isDestroyed && !this.isDestroying) {
         infinityModel.off(
           'infinityModelLoaded',
           this,