diff --git a/src/NetTopologySuite.IO.SqlServerBytes/SqlServerBytesWriter.cs b/src/NetTopologySuite.IO.SqlServerBytes/SqlServerBytesWriter.cs
index 3c5daa8..fab0bd8 100644
--- a/src/NetTopologySuite.IO.SqlServerBytes/SqlServerBytesWriter.cs
+++ b/src/NetTopologySuite.IO.SqlServerBytes/SqlServerBytesWriter.cs
@@ -207,6 +207,11 @@ bool addFigure(Geometry g, FigureAttribute figureAttribute)
                         {
                             geography.ZValues.Add(coordinate.Z);
                         }
+
+                        if (_emitM)
+                        {
+                            geography.MValues.Add(coordinate.M);
+                        }
                     }
 
                     if (!pointsAdded)
@@ -214,14 +219,6 @@ bool addFigure(Geometry g, FigureAttribute figureAttribute)
                         return false;
                     }
 
-                    if (_emitM)
-                    {
-                        foreach (double m in g.GetOrdinates(Ordinate.M))
-                        {
-                            geography.MValues.Add(m);
-                        }
-                    }
-
                     geography.Figures.Add(
                         new Figure
                         {