diff --git a/src/Mod/BIM/ArchCommands.py b/src/Mod/BIM/ArchCommands.py
index 668a246644..a446f7b722 100644
--- a/src/Mod/BIM/ArchCommands.py
+++ b/src/Mod/BIM/ArchCommands.py
@@ -232,6 +232,8 @@ def removeComponents(objectsList,host=None):
                     if o in a:
                         a.remove(o)
                         h.Objects = a
+            if hasattr(o, "Hosts") and Draft.getType(o) == "Window":
+                o.Hosts = []
 
 def makeComponent(baseobj=None,name=None,delete=False):
     '''makeComponent([baseobj],[name],[delete]): creates an undefined, non-parametric BIM