diff --git a/typo3/sysext/core/Classes/Resource/ResourceStorage.php b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
index a368b04c1bdaf76a711b7f36ced163dd06b391c2..0d34b943f8f1bb441cf23f551f86e059cd5b77a4 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceStorage.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
@@ -3044,7 +3044,7 @@ class ResourceStorage implements ResourceStorageInterface
                     break;
                 }
             }
-        } while ($recyclerFolder === null && $folder !== $rootFolder);
+        } while ($recyclerFolder === null && $folder->getCombinedIdentifier() !== $rootFolder->getCombinedIdentifier());
 
         return $recyclerFolder;
     }
diff --git a/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php b/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php
index cafef03239285d1416557d1d27ba0803d4b065a8..4506a002bb8eb87580616b5eae115528f4f31062 100644
--- a/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php
+++ b/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php
@@ -90,7 +90,7 @@ class ResourceStorageTest extends \TYPO3\TestingFramework\Core\Functional\Functi
         $subject = (new StorageRepository())->findByUid(1);
         $subject->setEvaluatePermissions(true);
 
-        // read_only = true -> no write access for user, so checkinf for second argument true should assert false
+        // read_only = true -> no write access for user, so checking for second argument true should assert false
         $subject->addFileMount('/' . $fileMountFolder . '/', ['read_only' => $isFileMountReadOnly]);
         $this->assertSame($expectedResult, $subject->isWithinFileMountBoundaries($file, $checkWriteAccess));
     }
@@ -209,4 +209,44 @@ class ResourceStorageTest extends \TYPO3\TestingFramework\Core\Functional\Functi
         $this->expectExceptionCode(1325689164);
         $subject->createFolder('newFolder', new Folder($subject, '/foo/', 'foo'));
     }
+
+    /**
+     * @test
+     */
+    public function deleteFileMovesFileToRecyclerFolderIfAvailable()
+    {
+        $this->importDataSet('PACKAGE:typo3/testing-framework/Resources/Core/Functional/Fixtures/sys_file_storage.xml');
+        $this->setUpBackendUserFromFixture(1);
+        $subject = (new StorageRepository())->findByUid(1);
+
+        GeneralUtility::mkdir_deep(PATH_site . 'fileadmin/foo');
+        GeneralUtility::mkdir_deep(PATH_site . 'fileadmin/_recycler_');
+        file_put_contents(PATH_site . 'fileadmin/foo/bar.txt', 'myData');
+        clearstatcache();
+
+        $file = ResourceFactory::getInstance()->getFileObjectFromCombinedIdentifier('1:/foo/bar.txt');
+        $subject->deleteFile($file);
+
+        $this->assertTrue(file_exists(PATH_site . 'fileadmin/_recycler_/bar.txt'));
+        $this->assertFalse(file_exists(PATH_site . 'fileadmin/foo/bar.txt'));
+    }
+
+    /**
+     * @test
+     */
+    public function deleteFileUnlinksFileIfNoRecyclerFolderAvailable()
+    {
+        $this->importDataSet('PACKAGE:typo3/testing-framework/Resources/Core/Functional/Fixtures/sys_file_storage.xml');
+        $this->setUpBackendUserFromFixture(1);
+        $subject = (new StorageRepository())->findByUid(1);
+
+        GeneralUtility::mkdir_deep(PATH_site . 'fileadmin/foo');
+        file_put_contents(PATH_site . 'fileadmin/foo/bar.txt', 'myData');
+        clearstatcache();
+
+        $file = ResourceFactory::getInstance()->getFileObjectFromCombinedIdentifier('1:/foo/bar.txt');
+        $subject->deleteFile($file);
+
+        $this->assertFalse(file_exists(PATH_site . 'fileadmin/foo/bar.txt'));
+    }
 }