diff --git a/platform/core/src/capabilities/ContextCapability.js b/platform/core/src/capabilities/ContextCapability.js
index c1e6b9c5a7..7dce323dac 100644
--- a/platform/core/src/capabilities/ContextCapability.js
+++ b/platform/core/src/capabilities/ContextCapability.js
@@ -80,7 +80,8 @@ define(
                                 parentObject.getCapability('context');
 
                     return parentContext ?
-                                parentContext.getRoot() : domainObject;
+                                parentContext.getRoot() :
+                                (parentObject || domainObject);
                 }
             };
         }