diff --git a/app/controllers/lnurlpay_controller.rb b/app/controllers/lnurlpay_controller.rb
index 067ba2b..3f0d67f 100644
--- a/app/controllers/lnurlpay_controller.rb
+++ b/app/controllers/lnurlpay_controller.rb
@@ -20,7 +20,7 @@ class LnurlpayController < ApplicationController
   def invoice
     amount = params[:amount].to_i / 1000 # msats
     address = params[:address]
-    comment = params[:comment]
+    comment = params[:comment] || ""
 
     if !valid_amount?(amount)
       render json: { status: "ERROR", reason: "Invalid amount" }
@@ -32,10 +32,12 @@ class LnurlpayController < ApplicationController
       return
     end
 
+    memo = "Sats for #{address}"
+    memo = "#{memo}: \"#{comment}\"" if comment.present?
+
     payment_request = @user.ln_create_invoice({
       amount: amount, # we create invoices in sats
-      description_hash: Digest::SHA2.hexdigest(metadata(address)),
-      memo: comment
+      memo: memo
     })
 
     render json: {
diff --git a/app/services/lndhub.rb b/app/services/lndhub.rb
index 15fae8e..ad606cc 100644
--- a/app/services/lndhub.rb
+++ b/app/services/lndhub.rb
@@ -49,7 +49,6 @@ class Lndhub
   def addinvoice(payload)
     invoice = post "addinvoice", {
       amt: payload[:amount],
-      description_hash: payload[:description_hash],
       memo: payload[:memo]
     }