diff --git a/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadHelper.kt b/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadHelper.kt
index 5f9e329926d0..664afee47524 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadHelper.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadHelper.kt
@@ -49,12 +49,11 @@ class FileDownloadHelper {
         val fileStorageManager = FileDataStorageManager(user, MainApp.getAppContext().contentResolver)
         val topParentId = fileStorageManager.getTopParentId(file)
 
-        return if (file.isFolder) {
-            backgroundJobManager.isStartFileDownloadJobScheduled(user, file.fileId) ||
-                backgroundJobManager.isStartFileDownloadJobScheduled(user, topParentId)
+        val isJobScheduled = backgroundJobManager.isStartFileDownloadJobScheduled(user, file.fileId)
+        return isJobScheduled || if (file.isFolder) {
+            backgroundJobManager.isStartFileDownloadJobScheduled(user, topParentId)
         } else {
-            backgroundJobManager.isStartFileDownloadJobScheduled(user, file.fileId) ||
-                FileDownloadWorker.isDownloading(user.accountName, file.fileId)
+            FileDownloadWorker.isDownloading(user.accountName, file.fileId)
         }
     }
 
diff --git a/app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java
index b78294808f6d..c746c476b7ac 100644
--- a/app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java
+++ b/app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java
@@ -273,7 +273,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
                 }
             }
 
-            if (downloadType == DownloadType.DOWNLOAD) {
+            if (downloadType == DownloadType.DOWNLOAD && !file.isEncrypted()) {
                 moved = tmpFile.renameTo(newFile);
                 newFile.setLastModified(file.getModificationTimestamp());
                 if (!moved) {