diff --git a/src/Mod/Part/App/TopoShapeExpansion.cpp b/src/Mod/Part/App/TopoShapeExpansion.cpp
index 6d6497085e..ef7ad3a2a0 100644
--- a/src/Mod/Part/App/TopoShapeExpansion.cpp
+++ b/src/Mod/Part/App/TopoShapeExpansion.cpp
@@ -4403,6 +4403,10 @@ TopoShape& TopoShape::makeElementPrismUntil(const TopoShape& _base,
 
                 srcShapes.push_back(result);
 
+                if (result.isInfinite()){
+                    result = face;
+                }
+
                 PrismMaker.Init(result.getShape(),
                                 face.getShape(),
                                 TopoDS::Face(supportFace.getShape()),