diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 2976c35530..962c4d6363 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -1185,6 +1185,12 @@ void Foam::globalMeshData::calcGlobalEdgeOrientation() const
 
         forAll(coupledPatch().edges(), edgeI)
         {
+            if (masterEdgeVerts[edgeI] == labelPair(labelMax, labelMax))
+            {
+                // Skip single edge on cyclic baffle
+                continue;
+            }
+
             const edge& e = coupledPatch().edges()[edgeI];
             const labelPair masterE
             (
@@ -1192,7 +1198,7 @@ void Foam::globalMeshData::calcGlobalEdgeOrientation() const
                 masterPoint[e[1]]
             );
 
-            label stat = labelPair::compare
+            const int stat = labelPair::compare
             (
                 masterE,
                 masterEdgeVerts[edgeI]