diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryEditFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryEditFragment.kt
index 71e45fa93..c854b535b 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryEditFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryEditFragment.kt
@@ -301,8 +301,9 @@ class EntryEditFragment: DatabaseFragment() {
     private fun putAttachment(attachment: EntryAttachmentState,
                               onPreviewLoaded: ((attachment: EntryAttachmentState) -> Unit)? = null) {
         // When only one attachment is allowed
-        if (!mAllowMultipleAttachments) {
-            clearAttachments()
+        if (!mAllowMultipleAttachments
+            && attachment.downloadState == AttachmentState.START) {
+            attachmentsAdapter?.clear()
         }
         attachmentsContainerView.visibility = View.VISIBLE
         attachmentsAdapter?.putItem(attachment)
@@ -315,10 +316,6 @@ class EntryEditFragment: DatabaseFragment() {
         attachmentsAdapter?.removeItem(attachment)
     }
 
-    private fun clearAttachments() {
-        attachmentsAdapter?.clear()
-    }
-
     private fun getAttachmentViewPosition(attachment: EntryAttachmentState,
                                           position: (attachment: EntryAttachmentState, Float) -> Unit) {
         attachmentsListView.postDelayed({