diff --git a/platform/core/src/capabilities/PersistenceCapability.js b/platform/core/src/capabilities/PersistenceCapability.js
index 74a6bc52e7..a1f5ae700d 100644
--- a/platform/core/src/capabilities/PersistenceCapability.js
+++ b/platform/core/src/capabilities/PersistenceCapability.js
@@ -130,6 +130,10 @@ define(
          *          be used to persist this object
          */
         PersistenceCapability.prototype.getSpace = function () {
+            if (this.domainObject.getId().indexOf(":") !== -1) {
+                return this.domainObject.getId().split(":")[0];
+            }
+
             return this.space;
         };