diff --git a/libraries/classes/Di/Migration.php b/libraries/classes/Di/Migration.php
index 299061065f..cef1fc46cf 100644
--- a/libraries/classes/Di/Migration.php
+++ b/libraries/classes/Di/Migration.php
@@ -66,6 +66,6 @@ class Migration
     public function setGlobal(string $key, $value)
     {
         $GLOBALS[$key] = $value;
-        $this->containerBuilder->setParameter($key, $value);
+        $this->containerBuilder->setParameter($key, $this->containerBuilder->getParameterBag()->escapeValue($value));
     }
 }
diff --git a/tbl_chart.php b/tbl_chart.php
index e7964461aa..a40904c088 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -25,9 +25,10 @@ $dependency_definitions = [
 
 /** @var Definition $definition */
 $definition = $containerBuilder->getDefinition(ChartController::class);
+$parameterBag = $containerBuilder->getParameterBag();
 array_map(
-    static function (string $parameterName, $value) use ($definition) {
-        $definition->replaceArgument($parameterName, $value);
+    static function (string $parameterName, $value) use ($definition, $parameterBag) {
+        $definition->replaceArgument($parameterName, $parameterBag->escapeValue($value));
     },
     array_keys($dependency_definitions),
     $dependency_definitions
diff --git a/tbl_find_replace.php b/tbl_find_replace.php
index f6747470ca..5dd964781f 100644
--- a/tbl_find_replace.php
+++ b/tbl_find_replace.php
@@ -30,9 +30,10 @@ $dependency_definitions = [
 
 /** @var Definition $definition */
 $definition = $containerBuilder->getDefinition(SearchController::class);
+$parameterBag = $containerBuilder->getParameterBag();
 array_map(
-    static function (string $parameterName, $value) use ($definition) {
-        $definition->replaceArgument($parameterName, $value);
+    static function (string $parameterName, $value) use ($definition, $parameterBag) {
+        $definition->replaceArgument($parameterName, $parameterBag->escapeValue($value));
     },
     array_keys($dependency_definitions),
     $dependency_definitions
diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
index bb96bbb915..ca3a3506b7 100644
--- a/tbl_gis_visualization.php
+++ b/tbl_gis_visualization.php
@@ -42,9 +42,10 @@ $dependency_definitions = [
 
 /** @var Definition $definition */
 $definition = $containerBuilder->getDefinition(GisVisualizationController::class);
+$parameterBag = $containerBuilder->getParameterBag();
 array_map(
-    static function (string $parameterName, $value) use ($definition) {
-        $definition->replaceArgument($parameterName, $value);
+    static function (string $parameterName, $value) use ($definition, $parameterBag) {
+        $definition->replaceArgument($parameterName, $parameterBag->escapeValue($value));
     },
     array_keys($dependency_definitions),
     $dependency_definitions
diff --git a/tbl_relation.php b/tbl_relation.php
index 398818e381..1d4cd8d4e3 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -77,9 +77,10 @@ if (Util::isForeignKeySupported($tbl_storage_engine)) {
 
 /** @var Definition $definition */
 $definition = $containerBuilder->getDefinition(RelationController::class);
+$parameterBag = $containerBuilder->getParameterBag();
 array_map(
-    static function (string $parameterName, $value) use ($definition) {
-        $definition->replaceArgument($parameterName, $value);
+    static function (string $parameterName, $value) use ($definition, $parameterBag) {
+        $definition->replaceArgument($parameterName, $parameterBag->escapeValue($value));
     },
     array_keys($dependency_definitions),
     $dependency_definitions
diff --git a/tbl_select.php b/tbl_select.php
index 23b2ad295a..4abd676436 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -30,9 +30,10 @@ $dependency_definitions = [
 
 /** @var Definition $definition */
 $definition = $containerBuilder->getDefinition(SearchController::class);
+$parameterBag = $containerBuilder->getParameterBag();
 array_map(
-    static function (string $parameterName, $value) use ($definition) {
-        $definition->replaceArgument($parameterName, $value);
+    static function (string $parameterName, $value) use ($definition, $parameterBag) {
+        $definition->replaceArgument($parameterName, $parameterBag->escapeValue($value));
     },
     array_keys($dependency_definitions),
     $dependency_definitions
diff --git a/tbl_structure.php b/tbl_structure.php
index 294a390c1b..0cda2b63e6 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -55,9 +55,10 @@ $dependency_definitions = [
 
 /** @var Definition $definition */
 $definition = $containerBuilder->getDefinition(StructureController::class);
+$parameterBag = $containerBuilder->getParameterBag();
 array_map(
-    static function (string $parameterName, $value) use ($definition) {
-        $definition->replaceArgument($parameterName, $value);
+    static function (string $parameterName, $value) use ($definition, $parameterBag) {
+        $definition->replaceArgument($parameterName, $parameterBag->escapeValue($value));
     },
     array_keys($dependency_definitions),
     $dependency_definitions
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index fc458ca458..2cea5cb0a1 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -29,9 +29,10 @@ $dependency_definitions = [
 
 /** @var Definition $definition */
 $definition = $containerBuilder->getDefinition(SearchController::class);
+$parameterBag = $containerBuilder->getParameterBag();
 array_map(
-    static function (string $parameterName, $value) use ($definition) {
-        $definition->replaceArgument($parameterName, $value);
+    static function (string $parameterName, $value) use ($definition, $parameterBag) {
+        $definition->replaceArgument($parameterName, $parameterBag->escapeValue($value));
     },
     array_keys($dependency_definitions),
     $dependency_definitions