diff --git a/app/scripts/models/attachment-model.js b/app/scripts/models/attachment-model.js
index 1f0d767a..511a9cda 100644
--- a/app/scripts/models/attachment-model.js
+++ b/app/scripts/models/attachment-model.js
@@ -3,10 +3,10 @@ import { Model } from 'framework/model';
 class AttachmentModel extends Model {
     getBinary() {
         let data = this.data;
-        if (data && data.ref) {
+        if (data?.value) {
             data = data.value;
         }
-        if (data && data.getBinary) {
+        if (data?.getBinary) {
             data = data.getBinary();
         }
         if (data instanceof ArrayBuffer && data.byteLength) {
diff --git a/app/scripts/models/entry-model.js b/app/scripts/models/entry-model.js
index 64c0f6cb..06ffa126 100644
--- a/app/scripts/models/entry-model.js
+++ b/app/scripts/models/entry-model.js
@@ -357,7 +357,7 @@ class EntryModel extends Model {
     addAttachment(name, data) {
         this._entryModified();
         return this.file.db.createBinary(data).then((binaryRef) => {
-            this.entry.binaries[name] = binaryRef;
+            this.entry.binaries.set(name, binaryRef);
             this._fillByEntry();
         });
     }
diff --git a/desktop/package.json b/desktop/package.json
index ac68e66b..ce999ecc 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "KeeWeb",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Free cross-platform password manager compatible with KeePass",
   "main": "main.js",
   "homepage": "https://keeweb.info",
diff --git a/package-lock.json b/package-lock.json
index 7de3d280..41ffe2c7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "keeweb",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index b06cf591..656791bc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "keeweb",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Free cross-platform password manager compatible with KeePass",
   "main": "Gruntfile.js",
   "private": true,
diff --git a/release-notes.md b/release-notes.md
index 9117a979..f2ba4c6b 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,5 +1,8 @@
 Release notes
 -------------
+##### v1.18.1 (2021-05-08)
+`-` fixed entry attachments display  
+
 ##### v1.18.0 (2021-05-08)
 `+` browser extension "KeeWeb Connect"  
 `+` support for KeePassXC-Browser