diff --git a/lib/Controller/API/V1/NewController.php b/lib/Controller/API/V1/NewController.php
index 89c530cff0..dcd2e03656 100644
--- a/lib/Controller/API/V1/NewController.php
+++ b/lib/Controller/API/V1/NewController.php
@@ -403,10 +403,8 @@ private function validateTheRequest(): array
                 'flags' => FILTER_REQUIRE_ARRAY,
                 'options' => function ($value) {
                     $value = Utils::stripTagsPreservingHrefs($value);
-                    /**
-                     * Uber plugin callback
-                     */
-                    return $this->featureSet->filter('encodeInstructions', $value);
+
+                    return htmlentities($value);
                 }
             ]
         );
diff --git a/lib/Controller/API/V3/FileInfoController.php b/lib/Controller/API/V3/FileInfoController.php
index b8dec9f3a6..633cb5704e 100644
--- a/lib/Controller/API/V3/FileInfoController.php
+++ b/lib/Controller/API/V3/FileInfoController.php
@@ -112,7 +112,7 @@ public function setInstructions(): void
         $instructions = $this->request->param('instructions');
         $filesInfoUtility = new FilesInfoUtility($this->chunk);
 
-        $instructions = $this->featureSet->filter('decodeInstructions', $instructions);
+        $instructions = html_entity_decode($instructions);
 
         if (empty($instructions)) {
             throw new InvalidArgumentException("Empty instructions provided");
diff --git a/lib/Model/ProjectManager/ProjectManager.php b/lib/Model/ProjectManager/ProjectManager.php
index db65335e07..b0f8eb2b15 100644
--- a/lib/Model/ProjectManager/ProjectManager.php
+++ b/lib/Model/ProjectManager/ProjectManager.php
@@ -2495,7 +2495,7 @@ protected function _insertFiles($_originalFileNames, $sha1_original, $cachedXlif
      */
     protected function _insertInstructions($fid, $value): void
     {
-        $value = $this->features->filter('decodeInstructions', $value);
+        $value = html_entity_decode($value);
 
         $this->filesMetadataDao->insert($this->projectStructure['id_project'], $fid, 'instructions', $value);
     }