diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index dc1509a81..5274289fc 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -4469,6 +4469,7 @@
         value = _ref[name];
         embed.dataset[name] = value;
       }
+      embed.dataset.nodedata = link.innerHTML;
       $.addClass(link, "" + embed.dataset.key);
       $.on(embed, 'click', Linkify.cb.toggle);
       $.after(link, [$.tn(' '), embed]);
@@ -4523,18 +4524,17 @@
         return el;
       },
       unembed: function(a) {
-        var el, href;
+        var el;
 
-        href = a.dataset.href;
         el = $.el('a', {
           rel: 'nofollow noreferrer',
           target: 'blank',
           className: 'linkify',
-          href: href,
-          textContent: a.dataset.title || href
+          href: a.dataset.href,
+          innerHTML: a.dataset.title || a.dataset.nodedata
         });
         a.textContent = '(embed)';
-        $.addClass(el, "" + a.dataset.key);
+        $.addClass(el, a.dataset.key);
         return el;
       },
       title: function(data) {
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 38cada217..d2295bea6 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -4474,6 +4474,7 @@
         value = _ref[name];
         embed.dataset[name] = value;
       }
+      embed.dataset.nodedata = link.innerHTML;
       $.addClass(link, "" + embed.dataset.key);
       $.on(embed, 'click', Linkify.cb.toggle);
       $.after(link, [$.tn(' '), embed]);
@@ -4528,18 +4529,17 @@
         return el;
       },
       unembed: function(a) {
-        var el, href;
+        var el;
 
-        href = a.dataset.href;
         el = $.el('a', {
           rel: 'nofollow noreferrer',
           target: 'blank',
           className: 'linkify',
-          href: href,
-          textContent: a.dataset.title || href
+          href: a.dataset.href,
+          innerHTML: a.dataset.title || a.dataset.nodedata
         });
         a.textContent = '(embed)';
-        $.addClass(el, "" + a.dataset.key);
+        $.addClass(el, a.dataset.key);
         return el;
       },
       title: function(data) {
diff --git a/src/Linkification/Linkify.coffee b/src/Linkification/Linkify.coffee
index ba46a0c58..25742786e 100644
--- a/src/Linkification/Linkify.coffee
+++ b/src/Linkification/Linkify.coffee
@@ -146,6 +146,8 @@ Linkify =
 
     for name, value of {key, href, uid, options}
       embed.dataset[name] = value
+    
+    embed.dataset.nodedata = link.innerHTML
 
     $.addClass link, "#{embed.dataset.key}"
 
@@ -205,16 +207,15 @@ Linkify =
 
     unembed: (a) ->
       # Recreate the original link.
-      {href} = a.dataset
       el = $.el 'a',
         rel:         'nofollow noreferrer'
         target:      'blank'
         className:   'linkify'
-        href:        href
-        textContent: a.dataset.title or href
+        href:        a.dataset.href
+        innerHTML:   a.dataset.title or a.dataset.nodedata
 
       a.textContent = '(embed)'
-      $.addClass el, "#{a.dataset.key}"
+      $.addClass el, a.dataset.key
 
       return el