diff --git a/packages/ember-runtime/lib/mixins/-proxy.js b/packages/ember-runtime/lib/mixins/-proxy.js
index 32bbb9d6e90..3cf6f355d0e 100644
--- a/packages/ember-runtime/lib/mixins/-proxy.js
+++ b/packages/ember-runtime/lib/mixins/-proxy.js
@@ -61,9 +61,9 @@ export default Mixin.create({
     m.writableTag(() => combine([DirtyableTag.create(), UpdatableTag.create(CONSTANT_TAG)]));
   },
 
-  destroy() {
-    this._super(...arguments);
+  willDestroy() {
     this.set('content', null);
+    this._super(...arguments);
   },
 
   isTruthy: computed('content', function() {