diff --git a/TYPO3.TYPO3CR/Classes/TYPO3/TYPO3CR/Domain/Model/Workspace.php b/TYPO3.TYPO3CR/Classes/TYPO3/TYPO3CR/Domain/Model/Workspace.php
index <HASH>..<HASH> 100644
--- a/TYPO3.TYPO3CR/Classes/TYPO3/TYPO3CR/Domain/Model/Workspace.php
+++ b/TYPO3.TYPO3CR/Classes/TYPO3/TYPO3CR/Domain/Model/Workspace.php
@@ -276,7 +276,7 @@ class Workspace
      */
     public function isInternalWorkspace()
     {
-        return $this->owner === null;
+        return $this->baseWorkspace !== null && $this->owner === null;
     }
 
     /**
Add additional check to isInternalWorkspace()