diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt
index c5754495e..18b9b1e4c 100644
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt
@@ -339,8 +339,7 @@ class NodeAdapter (private val context: Context)
             }
 
             holder.attachmentIcon?.visibility =
-                    if (entry.getAttachments(mDatabase.binaryPool).isNotEmpty())
-                        View.VISIBLE else View.GONE
+                    if (entry.containsAttachment()) View.VISIBLE else View.GONE
 
             mDatabase.stopManageEntry(entry)
         }
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/Entry.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/Entry.kt
index abe8ad712..af6899921 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/Entry.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/Entry.kt
@@ -336,9 +336,9 @@ class Entry : Node, EntryVersionedInterface<Group> {
         return attachments
     }
 
-    fun containsAttachment(attachment: Attachment, binaryPool: BinaryPool): Boolean {
-        return entryKDB?.containsAttachment(attachment) == true
-                || entryKDBX?.containsAttachment(attachment, binaryPool) == true
+    fun containsAttachment(): Boolean {
+        return entryKDB?.containsAttachment() == true
+                || entryKDBX?.containsAttachment() == true
     }
 
     fun putAttachment(attachment: Attachment, binaryPool: BinaryPool) {
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDB.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDB.kt
index 2a4dfa3e7..b239761ce 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDB.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDB.kt
@@ -145,7 +145,7 @@ class EntryKDB : EntryVersioned<Int, UUID, GroupKDB, EntryKDB>, NodeKDBInterface
         }
     }
 
-    fun containsAttachment(attachment: Attachment): Boolean {
+    fun containsAttachment(): Boolean {
         return binaryData != null
     }
 
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt
index e842ccdc8..9931ef248 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt
@@ -293,12 +293,8 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         return entryAttachmentList
     }
 
-    fun containsAttachment(attachment: Attachment, binaryPool: BinaryPool): Boolean {
-        for ((_, poolId) in binaries) {
-            if (binaryPool[poolId] == attachment.binaryAttachment)
-            return true
-        }
-        return false
+    fun containsAttachment(): Boolean {
+        return binaries.isNotEmpty()
     }
 
     fun putAttachment(attachment: Attachment, binaryPool: BinaryPool) {