From c6b6fa457da102ad41f3bf9743001a02fa0cdd6a Mon Sep 17 00:00:00 2001
From: Martin Broerse <broerse@martinic.com>
Date: Mon, 3 Sep 2018 16:07:05 +0200
Subject: [PATCH] Fix _updateLoadingPromise

---
 .../-legacy-private/system/relationships/state/relationship.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/-legacy-private/system/relationships/state/relationship.js b/addon/-legacy-private/system/relationships/state/relationship.js
index 2448ff39..f6b3864b 100644
--- a/addon/-legacy-private/system/relationships/state/relationship.js
+++ b/addon/-legacy-private/system/relationships/state/relationship.js
@@ -628,7 +628,7 @@ export default class Relationship {
   }
 
   _updateLoadingPromise(promise, content) {
-    if (this._promiseProxy) {
+    if (this._promiseProxy && this._promiseProxy.get('isPending')) {
       if (content !== undefined) {
         this._promiseProxy.set('content', content);
       }