diff --git a/class/User.js b/class/User.js
index 31a149d..3191faa 100644
--- a/class/User.js
+++ b/class/User.js
@@ -363,7 +363,7 @@ export class User {
       }
       if (invoice.decoded) {
         invoice.timestamp = invoice.decoded.timestamp;
-        invoice.memo = invoice.decoded.description;
+        invoice.memo = invoice.memo || invoice.decoded.description;
       }
       if (invoice.payment_preimage) {
         invoice.payment_preimage = Buffer.from(invoice.payment_preimage, 'hex').toString('hex');
diff --git a/controllers/api.js b/controllers/api.js
index d50622b..efdd7d8 100644
--- a/controllers/api.js
+++ b/controllers/api.js
@@ -197,6 +197,7 @@ router.post('/addinvoice', postLimiter, async function (req, res) {
     async function (err, info) {
       if (err) return errorLnd(res);
 
+      info.memo = req.body.memo;
       info.pay_req = info.payment_request; // client backwards compatibility
       await u.saveUserInvoice(info);
       await invoice.savePreimage(r_preimage);