diff --git a/libs/MeshKernel/src/MeshBoundaryExtractor.cpp b/libs/MeshKernel/src/MeshBoundaryExtractor.cpp
index 29fb46bd8..d3913e1ae 100644
--- a/libs/MeshKernel/src/MeshBoundaryExtractor.cpp
+++ b/libs/MeshKernel/src/MeshBoundaryExtractor.cpp
@@ -289,9 +289,11 @@ void meshkernel::MeshBoundaryExtractor::FindAllBoundarEdges(const std::vector<Po
     for (UInt count = 0; count < edges.size(); ++count)
     {
 
-        if (edgesFaces[count][1] != constants::missing::uintValue || !IsValidEdge(edges[count]))
+        if (!IsValidEdge(edges[count]) ||
+            edgesFaces[count][0] == constants::missing::uintValue ||
+            edgesFaces[count][1] != constants::missing::uintValue)
         {
-            // Edge is either invalid or not on boundary
+            // Edge is invalid, has no adjacent face (hanging edge), or is interior (two faces)
             continue;
         }
 
@@ -366,12 +368,10 @@ void meshkernel::MeshBoundaryExtractor::FindBoundaryPolygons(const std::vector<P
     for (UInt count = 0; count < edges.size(); ++count)
     {
 
-        if (!IsValidEdge(edges[count]))
-        {
-            continue;
-        }
-
-        if (edgesFaces[count][1] != constants::missing::uintValue || edgeVisited[count])
+        if (edgeVisited[count] ||
+            !IsValidEdge(edges[count]) ||
+            edgesFaces[count][0] == constants::missing::uintValue ||
+            edgesFaces[count][1] != constants::missing::uintValue)
         {
             continue;
         }
diff --git a/libs/MeshKernel/tests/src/Mesh2DTest.cpp b/libs/MeshKernel/tests/src/Mesh2DTest.cpp
index 05b6cc4e6..a92934492 100644
--- a/libs/MeshKernel/tests/src/Mesh2DTest.cpp
+++ b/libs/MeshKernel/tests/src/Mesh2DTest.cpp
@@ -423,6 +423,42 @@ TEST(Mesh2D, HangingEdge)
     ASSERT_EQ(1, mesh.GetNumFaces());
 }
 
+TEST(Mesh2D, MeshBoundaryToPolygonWithHangingEdge)
+{
+    // 1 Setup
+    std::vector<meshkernel::Point> nodes;
+    nodes.push_back({0.0, 0.0});
+    nodes.push_back({5.0, 0.0});
+    nodes.push_back({3.0, 2.0});
+    nodes.push_back({3.0, 4.0});
+
+    std::vector<meshkernel::Edge> edges;
+    edges.push_back({0, 1});
+    edges.push_back({1, 3});
+    edges.push_back({3, 0});
+    edges.push_back({2, 1});
+
+    auto mesh = meshkernel::Mesh2D(meshkernel::Projection::cartesian);
+    mesh.SetNodes(nodes);
+    mesh.SetEdges(edges);
+    mesh.Administrate();
+
+    std::vector<meshkernel::Point> polygonNodes;
+
+    // 2 Execution
+    auto meshBoundaryPolygon = mesh.ComputeBoundaryPolygons(polygonNodes);
+
+    // 3 Validation
+    const double tolerance = 1e-5;
+    ASSERT_EQ(4, meshBoundaryPolygon.size());
+
+    for (const auto& point : meshBoundaryPolygon)
+    {
+        const double distanceToHangingNode = std::hypot(point.x - nodes[2].x, point.y - nodes[2].y);
+        EXPECT_GT(distanceToHangingNode, tolerance);
+    }
+}
+
 TEST(Mesh2D, NodeMerging)
 {
     // 1. Setup