diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
index 7a8e41cf7..eaf6014fe 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
@@ -354,10 +354,6 @@ class EntryEditActivity : LockingActivity(),
                     when (entryAttachmentState.downloadState) {
                         AttachmentState.START -> {
                             entryEditFragment?.apply {
-                                // When only one attachment is allowed
-                                if (!mAllowMultipleAttachments) {
-                                    clearAttachments()
-                                }
                                 putAttachment(entryAttachmentState)
                                 // Scroll to the attachment position
                                 getAttachmentViewPosition(entryAttachmentState) {
@@ -470,6 +466,11 @@ class EntryEditActivity : LockingActivity(),
 
     private fun startUploadAttachment(attachmentToUploadUri: Uri?, attachment: Attachment?) {
         if (attachmentToUploadUri != null && attachment != null) {
+            // When only one attachment is allowed
+            if (!mAllowMultipleAttachments) {
+                entryEditFragment?.clearAttachments()
+            }
+            // TODO if (!mAllowMultipleAttachments && !fileUploading)
             // Start uploading in service
             mAttachmentFileBinderManager?.startUploadAttachment(attachmentToUploadUri, attachment)
             // Add in temp list
diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/AnimatedItemsAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/AnimatedItemsAdapter.kt
index 0e276240e..011d4219c 100644
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/AnimatedItemsAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/AnimatedItemsAdapter.kt
@@ -120,7 +120,9 @@ abstract class AnimatedItemsAdapter<Item, T: RecyclerView.ViewHolder>(val contex
     }
 
     fun clear() {
-        itemsList.clear()
-        notifyDataSetChanged()
+        if (itemsList.size > 0) {
+            itemsList.clear()
+            notifyDataSetChanged()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
index 45b16b3e5..ba16b6cbe 100644
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
@@ -90,6 +90,8 @@ class EntryAttachmentsItemsAdapter(context: Context)
                         }
                     }
                 }
+            } else {
+                visibility = View.GONE
             }
             this.setOnClickListener {
                 ImageViewerActivity.getInstance(context, entryAttachmentState.attachment)