diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
index 73aeb3e5ab1e..2673397f7e41 100644
--- a/src/providers/mssql/qgsmssqlprovider.cpp
+++ b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -999,8 +999,7 @@ bool QgsMssqlProvider::addFeatures( QgsFeatureList &flist, Flags flags )
           // Z and M on the end of a WKT string isn't valid for
           // SQL Server so we have to remove it first.
           wkt = geom.exportToWkt();
-          wkt = wkt.replace( "Z", "" );
-          wkt = wkt.replace( "M", "" );
+          wkt.replace(QRegExp("[mzMZ]+\\s*\\("), "(");
         }
         query.addBindValue( wkt );
       }
@@ -1336,9 +1335,7 @@ bool QgsMssqlProvider::changeGeometryValues( const QgsGeometryMap &geometry_map
       QString wkt = it->exportToWkt();
       // Z and M on the end of a WKT string isn't valid for
       // SQL Server so we have to remove it first.
-      wkt = wkt.replace( "Z", "" );
-      wkt = wkt.replace( "M", "" );
-      QgsDebugMsg( wkt );
+      wkt.replace(QRegExp("[mzMZ]+\\s*\\("), "(");
       query.addBindValue( wkt );
     }