diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
index 43efe281..dacd5e25 100644
--- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html
+++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html
@@ -1443,7 +1443,7 @@
         LNbits.api
           .request(
             'GET',
-            '/diagonalley/api/v1/keys',
+            '/diagonalley/api/v1/keys/merchant',
             this.g.user.wallets[0].adminkey
           )
           .then(response => {
diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py
index c3023ea3..5408a6a4 100644
--- a/lnbits/extensions/diagonalley/views_api.py
+++ b/lnbits/extensions/diagonalley/views_api.py
@@ -489,8 +489,10 @@ async def api_diagonalley_generate_keys():
         private_key = PrivateKey()
         public_key = private_key.pubkey.serialize().hex()
 
-    # set pubkey in order
-    await set_diagonalley_order_pubkey(payment_hash, pubkey=public_key[2:])
+    # if the call is made from merchant's side skip adding pubkey to order
+    if(payment_hash != "merchant"):
+        # set pubkey in order
+        await set_diagonalley_order_pubkey(payment_hash, pubkey=public_key[2:])
     return {"privkey": private_key.serialize(), "pubkey": public_key[2:]}