diff --git a/src/main/java/com/owncloud/android/datamodel/OCFile.java b/src/main/java/com/owncloud/android/datamodel/OCFile.java
index c65359cd83c5..2d7cca274a41 100644
--- a/src/main/java/com/owncloud/android/datamodel/OCFile.java
+++ b/src/main/java/com/owncloud/android/datamodel/OCFile.java
@@ -503,6 +503,8 @@ private void resetData() {
         mEtagInConflict = null;
         mShareWithSharee = false;
         mIsFavorite = false;
+        mIsEncrypted = false;
+        mEncryptedFileName = null;
     }
 
     /**
diff --git a/src/main/java/com/owncloud/android/utils/FileStorageUtils.java b/src/main/java/com/owncloud/android/utils/FileStorageUtils.java
index fdc564cd984d..5425b79a5187 100644
--- a/src/main/java/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/main/java/com/owncloud/android/utils/FileStorageUtils.java
@@ -217,7 +217,9 @@ public static OCFile fillOCFile(RemoteFile remote) {
         file.setPermissions(remote.getPermissions());
         file.setRemoteId(remote.getRemoteId());
         file.setFavorite(remote.getIsFavorite());
-        file.setEncrypted(remote.getIsEncrypted());
+        if (file.isFolder()) {
+            file.setEncrypted(remote.getIsEncrypted());
+        }
         return file;
     }