diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
index fac812e3c4..16c8c82874 100644
--- a/libraries/classes/InsertEdit.php
+++ b/libraries/classes/InsertEdit.php
@@ -1272,8 +1272,7 @@ class InsertEdit
             || in_array($editField->function, $this->getGisFromWKBFunctions())
         ) {
             preg_match('/^(\'?)(.*?)\1(?:,(\d+))?$/', $editField->value, $matches);
-            $escapedParams = "'" . $this->dbi->escapeString($matches[2])
-                . (isset($matches[3]) ? "'," . $matches[3] : "'");
+            $escapedParams = $this->dbi->quoteString($matches[2]) . (isset($matches[3]) ? ',' . $matches[3] : '');
 
             return $editField->function . '(' . $escapedParams . ')';
         }
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 99a52f4053..d1bd79a7db 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -7876,9 +7876,6 @@
     </PossiblyUnusedMethod>
   </file>
   <file src="libraries/classes/InsertEdit.php">
-    <DeprecatedMethod>
-      <code>escapeString</code>
-    </DeprecatedMethod>
     <InvalidArgument>
       <code>$urlParams</code>
     </InvalidArgument>