diff --git a/src/Mod/PartDesign/App/FeatureExtrude.cpp b/src/Mod/PartDesign/App/FeatureExtrude.cpp
index 6d0e4938e0..e2deb3f82b 100644
--- a/src/Mod/PartDesign/App/FeatureExtrude.cpp
+++ b/src/Mod/PartDesign/App/FeatureExtrude.cpp
@@ -141,8 +141,13 @@ TopoShape FeatureExtrude::makeShellFromUpToShape(TopoShape shape, TopoShape sket
         dir = -dir;
         cfaces = Part::findAllFacesCutBy(shape, sketchshape, dir);
     }
-    struct Part::cutTopoShapeFaces *nearFace;
-    struct Part::cutTopoShapeFaces *farFace;
+
+    if (cfaces.empty()) {
+        return shape;
+    }
+
+    struct Part::cutTopoShapeFaces *nearFace {};
+    struct Part::cutTopoShapeFaces *farFace {};
     nearFace = farFace = &cfaces.front();
     for (auto &face : cfaces) {
         if (face.distsq > farFace->distsq) {