diff --git a/src/ifcopenshell-python/ifcopenshell/api/spatial/assign_container.py b/src/ifcopenshell-python/ifcopenshell/api/spatial/assign_container.py
index f502762933..149dea4d55 100644
--- a/src/ifcopenshell-python/ifcopenshell/api/spatial/assign_container.py
+++ b/src/ifcopenshell-python/ifcopenshell/api/spatial/assign_container.py
@@ -20,6 +20,12 @@ class Usecase:
         if contains_elements and contained_in_structure and contained_in_structure[0] == contains_elements[0]:
             return
 
+        aggregate = ifcopenshell.util.element.get_aggregate(self.settings["product"])
+        if aggregate:
+            ifcopenshell.api.run(
+                "aggregate.unassign_object", self.file, relating_object=aggregate, product=self.settings["product"]
+            )
+
         if contained_in_structure:
             related_elements = list(contained_in_structure[0].RelatedElements)
             related_elements.remove(self.settings["product"])
diff --git a/src/ifcopenshell-python/test/api/spatial/test_assign_container.py b/src/ifcopenshell-python/test/api/spatial/test_assign_container.py
index bcf0052b0b..b06dbfdfe2 100644
--- a/src/ifcopenshell-python/test/api/spatial/test_assign_container.py
+++ b/src/ifcopenshell-python/test/api/spatial/test_assign_container.py
@@ -6,7 +6,7 @@ import ifcopenshell.util.element
 import ifcopenshell.util.placement
 
 
-class TestEditObjectPlacement(test.bootstrap.IFC4):
+class TestAssignContainer(test.bootstrap.IFC4):
     def test_assigning_a_container(self):
         element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcBuilding")
         subelement = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
@@ -88,3 +88,13 @@ class TestEditObjectPlacement(test.bootstrap.IFC4):
         subelement.ObjectPlacement = placement
         ifcopenshell.api.run("spatial.assign_container", self.file, product=subelement, relating_structure=element)
         assert subelement.ObjectPlacement == placement
+
+    def test_removing_aggregation_if_it_exists(self):
+        ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcProject")
+        ifcopenshell.api.run("unit.assign_unit", self.file)
+        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcBuilding")
+        aggregate = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcElementAssembly")
+        subelement = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
+        ifcopenshell.api.run("aggregate.assign_object", self.file, product=subelement, relating_object=aggregate)
+        ifcopenshell.api.run("spatial.assign_container", self.file, product=subelement, relating_structure=element)
+        assert not ifcopenshell.util.element.get_aggregate(subelement)
diff --git a/src/ifcopenshell-python/test/api/spatial/test_remove_container.py b/src/ifcopenshell-python/test/api/spatial/test_remove_container.py
new file mode 100644
index 0000000000..227e90e98d
--- /dev/null
+++ b/src/ifcopenshell-python/test/api/spatial/test_remove_container.py
@@ -0,0 +1,36 @@
+import numpy
+import pytest
+import test.bootstrap
+import ifcopenshell.api
+import ifcopenshell.util.element
+import ifcopenshell.util.placement
+
+
+class TestRemoveContainer(test.bootstrap.IFC4):
+    def test_removing_a_container(self):
+        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcBuilding")
+        subelement = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
+        ifcopenshell.api.run("spatial.assign_container", self.file, product=subelement, relating_structure=element)
+        ifcopenshell.api.run("spatial.remove_container", self.file, product=subelement)
+        assert ifcopenshell.util.element.get_container(subelement) is None
+
+    def test_doing_nothing_if_no_container(self):
+        subelement = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
+        ifcopenshell.api.run("spatial.remove_container", self.file, product=subelement)
+        assert ifcopenshell.util.element.get_container(subelement) is None
+
+    def test_updating_the_rel_when_a_container_is_removed_with_multipled_elements(self):
+        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcBuilding")
+        subelement1 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
+        subelement2 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
+        ifcopenshell.api.run("spatial.assign_container", self.file, product=subelement1, relating_structure=element)
+        ifcopenshell.api.run("spatial.assign_container", self.file, product=subelement2, relating_structure=element)
+        ifcopenshell.api.run("spatial.remove_container", self.file, product=subelement1)
+        assert self.file.by_type("IfcRelContainedInSpatialStructure")[0].RelatedElements == (subelement2,)
+
+    def test_deleting_the_rel_when_a_container_is_removed_with_no_elements(self):
+        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcBuilding")
+        subelement = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
+        ifcopenshell.api.run("spatial.assign_container", self.file, product=subelement, relating_structure=element)
+        ifcopenshell.api.run("spatial.remove_container", self.file, product=subelement)
+        assert len(self.file.by_type("IfcRelContainedInSpatialStructure")) == 0