diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java
index 482f492349f98649eb65b812033553cb84faa537..b88636fe80e85e5b13d33653e905c2d5c56d2c2c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java
@@ -454,11 +454,8 @@ abstract class AbstractSampleBusinessObject extends AbstractSampleIdentifierBusi
     {
         checkPropertiesBusinessRules(sample, cacheOrNull);
         checkExperimentBusinessRules(dataDAO, sample);
-        if (spaceUpdated)
-        {
-            checkParentBusinessRules(sample);
-            checkContainerBusinessRules(sample);
-        }
+        checkParentBusinessRules(sample);
+        checkContainerBusinessRules(sample);
     }
 
     protected void checkPropertiesBusinessRules(SamplePE sample,
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java
index efed56395227fcc482472f4e6534eaa90ab413de..64229c716c9a6782a84acb5c4b7da396c8132678 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java
@@ -111,6 +111,7 @@ public class UnassignSampleFromSpaceTest extends BaseTest
     public void spaceAssignmentOfChildSampleIsNotChangedWhenParentSampleIsUnassignedFromSpace()
             throws Exception
     {
+
         Sample parent = create(aSample().inExperiment(experiment));
         Sample child = create(aSample().withParent(parent).inExperiment(experiment));
 
@@ -121,7 +122,7 @@ public class UnassignSampleFromSpaceTest extends BaseTest
 
     @Test(expectedExceptions =
         { UserFailureException.class })
-    public void componentOfSpaceLevelSampleCanBeUnassignedFromSpace() throws Exception
+    public void componentOfSpaceLevelSampleCantBeUnassignedFromSpace() throws Exception
     {
         Sample container = create(aSample().inExperiment(experiment));
         Sample component = create(aSample().inExperiment(experiment).inContainer(container));
@@ -129,18 +130,6 @@ public class UnassignSampleFromSpaceTest extends BaseTest
         perform(anUpdateOf(component).removingSpace());
     }
 
-    @Test
-    public void spaceAssociationOfContainerSampleIsNotChangedWhenComponentSampleIsUnassignedFromSpace()
-            throws Exception
-    {
-        Sample container = create(aSample().inExperiment(experiment));
-        Sample component = create(aSample().inExperiment(experiment).inContainer(container));
-
-        perform(anUpdateOf(component).removingSpace());
-
-        assertThat(container, is(inSpace(space)));
-    }
-
     @Test
     public void containerOfSpaceLevelSampleCanBeUnassignedFromSpace() throws Exception
     {