diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
index d00aae95c..689e02769 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
@@ -255,8 +255,11 @@ class DownloadManager(/* SY private */ val context: Context) {
         val newName = provider.getChapterDirName(newChapter)
         val mangaDir = provider.getMangaDir(manga, source)
 
-        val oldFolderName = oldName.find { mangaDir.findFile(it) != null }
-        val oldFolder = mangaDir.findFile(oldFolderName)
+        var oldFolder: UniFile? = null
+        val oldFolderName = oldName.find {
+            oldFolder = mangaDir.findFile(it)
+            oldFolder != null
+        }
         if (oldFolder?.renameTo(newName) == true) {
             cache.removeChapter(oldChapter, manga)
             cache.addChapter(newName, mangaDir, manga)