diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py
index fba1fff4bc..00fcdbcc3b 100644
--- a/src/Mod/Arch/ArchComponent.py
+++ b/src/Mod/Arch/ArchComponent.py
@@ -661,17 +661,19 @@ class Component:
                         if not placement.isNull():
                             obj.Placement = placement
                     else:
-                        FreeCAD.Console.PrintWarning(obj.Label + " " + translate("Arch","has no solid")+"\n")
                         if allownosolid:
                             obj.Shape = shape
                             if not placement.isNull():
                                 obj.Placement = placement
+                        else:
+                            FreeCAD.Console.PrintWarning(obj.Label + " " + translate("Arch","has no solid")+"\n")
                 else:
-                    FreeCAD.Console.PrintWarning(obj.Label + " " + translate("Arch","has an invalid shape")+"\n")
                     if allowinvalid:
                         obj.Shape = shape
                         if not placement.isNull():
                             obj.Placement = placement
+                    else:
+                        FreeCAD.Console.PrintWarning(obj.Label + " " + translate("Arch","has an invalid shape")+"\n")
             else:
                 FreeCAD.Console.PrintWarning(obj.Label + " " + translate("Arch","has a null shape")+"\n")
 
diff --git a/src/Mod/Arch/ArchEquipment.py b/src/Mod/Arch/ArchEquipment.py
index b4227bf8ba..a04c5223b2 100644
--- a/src/Mod/Arch/ArchEquipment.py
+++ b/src/Mod/Arch/ArchEquipment.py
@@ -280,7 +280,7 @@ class _Equipment(ArchComponent.Component):
                     base = base.removeSplitteR()
                 if base:
                     base = self.processSubShapes(obj,base,pl)
-                    self.applyShape(obj,base,pl)
+                    self.applyShape(obj,base,pl,allowinvalid=False,allownosolid=True)
 
 
 class _ViewProviderEquipment(ArchComponent.ViewProviderComponent):