diff --git a/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.h b/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.h
index e4f3e299d2..b731a5704a 100644
--- a/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.h
+++ b/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.h
@@ -86,6 +86,7 @@ private:
 	private:
 		OpenCascadeKernel* kernel_;
 		std::set<int> duplicates_;
+		std::map<int, int> duplicate_skips_remaining_;
 		std::map<int, int> vertex_mapping_;
 		std::map<std::pair<int, int>, TopoDS_Edge> edges_;
 		double eps_;
diff --git a/src/ifcgeom/kernels/opencascade/faceset_helper.cpp b/src/ifcgeom/kernels/opencascade/faceset_helper.cpp
index e86276f1c6..d5a32c30bf 100644
--- a/src/ifcgeom/kernels/opencascade/faceset_helper.cpp
+++ b/src/ifcgeom/kernels/opencascade/faceset_helper.cpp
@@ -108,6 +108,7 @@ IfcGeom::OpenCascadeKernel::faceset_helper::faceset_helper(
 
 		vertex_mapping_.clear();
 		duplicates_.clear();
+		duplicate_skips_remaining_.clear();
 
 		edge_use.clear();
 
@@ -174,6 +175,7 @@ IfcGeom::OpenCascadeKernel::faceset_helper::faceset_helper(
 			if (edge_sets.find({loop->external.get_value_or(false), segment_set}) != edge_sets.end()) {
 				duplicate_faces++;
 				duplicates_.insert(loop->identity());
+				duplicate_skips_remaining_[loop->identity()]++;
 				continue;
 			}
             edge_sets.insert({loop->external.get_value_or(false), segment_set});
@@ -250,7 +252,10 @@ bool IfcGeom::OpenCascadeKernel::faceset_helper::wire(const ifcopenshell::geomet
 }
 
 bool IfcGeom::OpenCascadeKernel::faceset_helper::wires(const ifcopenshell::geometry::taxonomy::loop::ptr loop, NCollection_List<TopoDS_Shape>& wires) {
-	if (duplicates_.find(loop->identity()) != duplicates_.end()) {
+	// Skip only the redundant occurrences, keep one copy of the face.
+	auto it = duplicate_skips_remaining_.find(loop->identity());
+	if (it != duplicate_skips_remaining_.end() && it->second > 0) {
+		--it->second;
 		return false;
 	}
 	TopoDS_Wire wire;