diff --git a/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php b/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php
index 8a675f6daa5c3e614192cdec9f9676e4f6295e2d..d36772e1a1ff2205f31be33efd32a3e745cc7189 100644
--- a/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php
+++ b/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php
@@ -310,9 +310,8 @@ class FormPersistenceManager implements FormPersistenceManagerInterface
 
         foreach ($this->getAccessibleFormStorageFolders() as $folder) {
             $storage = $folder->getStorage();
-            $storage->addFileAndFolderNameFilter([
-                $fileExtensionFilter,
-                'filterFileList'
+            $storage->setFileAndFolderNameFilters([
+                [$fileExtensionFilter, 'filterFileList']
             ]);
 
             $files = $folder->getFiles(
diff --git a/typo3/sysext/install/Classes/Updates/SvgFilesSanitization.php b/typo3/sysext/install/Classes/Updates/SvgFilesSanitization.php
index 15a9ef2915f1aa2bcf347e03da495692d27fb165..74c3d95d09842dbb877d4226fdfeae52ac840cec 100644
--- a/typo3/sysext/install/Classes/Updates/SvgFilesSanitization.php
+++ b/typo3/sysext/install/Classes/Updates/SvgFilesSanitization.php
@@ -163,8 +163,10 @@ class SvgFilesSanitization implements UpgradeWizardInterface, ConfirmableInterfa
     {
         $filter = GeneralUtility::makeInstance(FileExtensionFilter::class);
         $filter->setAllowedFileExtensions(['svg', 'svgz']);
-        return $storage
-            ->setFileAndFolderNameFilters([[$filter, 'filterFileList']])
+        $files = $storage
+            ->setFileAndFolderNameFilters([
+                [$filter, 'filterFileList']
+            ])
             ->getFilesInFolder(
                 $storage->getRootLevelFolder(),
                 0,
@@ -172,6 +174,8 @@ class SvgFilesSanitization implements UpgradeWizardInterface, ConfirmableInterfa
                 true,
                 true
             );
+        $storage->resetFileAndFolderNameFiltersToDefault();
+        return $files;
     }
 
     protected function processSvgFiles(): bool