diff --git a/lib/tools.js b/lib/tools.js
index e8e35f64..e1be6d27 100644
--- a/lib/tools.js
+++ b/lib/tools.js
@@ -186,7 +186,7 @@ function formatMessage(serviceUrl, campaign, list, subscription, message, filter
             return links[key];
         }
         if (subscription.mergeTags.hasOwnProperty(key)) {
-            return isHTML ? he.encode(subscription.mergeTags[key], {
+            return isHTML ? he.encode((subscription.mergeTags[key] || ''), {
                 useNamedReferences: true
             }) : subscription.mergeTags[key];
         }
@@ -295,4 +295,4 @@ function mergeTemplateIntoLayout(template, layout, callback) {
     } else {
         return done(template, layout);
     }
-}
\ No newline at end of file
+}
diff --git a/services/sender.js b/services/sender.js
index 400168bb..ab84485c 100644
--- a/services/sender.js
+++ b/services/sender.js
@@ -414,10 +414,6 @@ function formatMessage(message, callback) {
                                         'List-ID': {
                                             prepared: true,
                                             value: libmime.encodeWords(list.name) + ' <' + list.cid + '.' + (url.parse(configItems.serviceUrl).hostname || 'localhost') + '>'
-                                        },
-                                        'List-Unsubscribe': {
-                                            prepared: true,
-                                            value: url.resolve(configItems.serviceUrl, '/subscription/' + list.cid + '/unsubscribe/' + message.subscription.cid + '?auto=yes')
                                         }
                                     },
                                     list: {