diff --git a/vendor/assets/javascripts/ember-cloaking.js b/vendor/assets/javascripts/ember-cloaking.js
index 6c2963464..c207d9307 100644
--- a/vendor/assets/javascripts/ember-cloaking.js
+++ b/vendor/assets/javascripts/ember-cloaking.js
@@ -329,6 +329,9 @@
     },
 
     updateChildView: function () {
+      // If the element has been destroyed before this call occurs
+      if (!this) { return; }
+
       this._scheduled = false;
       if (!this._elementCreated || this.isDestroying || this.isDestroyed) { return; }