diff --git a/README.md b/README.md
index 2e959846..31c8532f 100644
--- a/README.md
+++ b/README.md
@@ -20,9 +20,10 @@ suited for even large documents.
 * Podcast [**"Yjs Deep Dive into real time collaborative editing solutions":**](https://www.tag1consulting.com/blog/deep-dive-real-time-collaborative-editing-solutions-tagteamtalk-001-0)
 * Podcast [**"Google Docs-style editing in Gutenberg with the YJS framework":**](https://publishpress.com/blog/yjs/)
 
-:construction_worker_woman: If you are looking for professional (paid) support to build
-collaborative or distributed applications ping us at <yjs@tag1consulting.com>. Otherwise
-you can find help on our [discussion board](https://discuss.yjs.dev).
+:construction_worker_woman: If you are looking for professional (paid) support to
+build collaborative or distributed applications ping us at
+<yjs@tag1consulting.com>. Otherwise you can find help on our
+[discussion board](https://discuss.yjs.dev).
 
 ## Table of Contents
 
diff --git a/src/types/YText.js b/src/types/YText.js
index 6092f172..7a33cd6d 100644
--- a/src/types/YText.js
+++ b/src/types/YText.js
@@ -800,27 +800,24 @@ export class YText extends AbstractType {
               str += /** @type {ContentString} */ (n.content).str
               break
             }
-            case ContentEmbed:
+            case ContentEmbed: {
               packStr()
-              /**
-               * @type {Object<string,any>}
-               */
-              const attributes = {}
-              let addAttributes = false;
-              for (const [key, value] of currentAttributes) {
-                addAttributes = true;
-                attributes[key] = value
-              }
               /**
                * @type {Object<string,any>}
                */
               const op = {
                 insert: /** @type {ContentEmbed} */ (n.content).embed
               }
-              if(addAttributes) {
-                op.attributes = attributes
+              if (currentAttributes.size > 0) {
+                const attrs = /** @type {Object<string,any>} */ ({})
+                op.attributes = attrs
+                for (const [key, value] of currentAttributes) {
+                  attrs[key] = value
+                }
               }
               ops.push(op)
+              break
+            }
             case ContentFormat:
               if (isVisible(n, snapshot)) {
                 packStr()
diff --git a/tests/y-text.tests.js b/tests/y-text.tests.js
index 5b508746..ae3634a2 100644
--- a/tests/y-text.tests.js
+++ b/tests/y-text.tests.js
@@ -164,11 +164,19 @@ export const testToJson = tc => {
  */
 export const testToDeltaEmbedAttributes = tc => {
   const { text0 } = init(tc, { users: 1 })
-  text0.insertEmbed(0, { image: 'imageSrc.png' }, { width: 100 })
-  const [delta0] = text0.toDelta();
-  t.assert(!!delta0.attributes, 'toDelta correctly reads attributes')
-  const { text0: text1 } = init(tc, { users: 1 })
-  text1.insertEmbed(1, { image: 'imageSrc.png' })
-  const [delta1] = text1.toDelta();
-  t.assert(!delta1.hasOwnProperty('attributes'), 'toDelta does not set attributes key when no attributes are present')
+  text0.insert(0, 'ab', { bold: true })
+  text0.insertEmbed(1, { image: 'imageSrc.png' }, { width: 100 })
+  const delta0 = text0.toDelta()
+  t.compare(delta0, [{ insert: 'a', attributes: { bold: true } }, { insert: { image: 'imageSrc.png' }, attributes: { width: 100 } }, { insert: 'b', attributes: { bold: true } }])
+}
+
+/**
+ * @param {t.TestCase} tc
+ */
+export const testToDeltaEmbedNoAttributes = tc => {
+  const { text0 } = init(tc, { users: 1 })
+  text0.insert(0, 'ab', { bold: true })
+  text0.insertEmbed(1, { image: 'imageSrc.png' })
+  const delta0 = text0.toDelta()
+  t.compare(delta0, [{ insert: 'a', attributes: { bold: true } }, { insert: { image: 'imageSrc.png' } }, { insert: 'b', attributes: { bold: true } }], 'toDelta does not set attributes key when no attributes are present')
 }