diff --git a/electrum/lnchannel.py b/electrum/lnchannel.py
index ea7cbac4d..f8aa14a8a 100644
--- a/electrum/lnchannel.py
+++ b/electrum/lnchannel.py
@@ -574,7 +574,7 @@ class Channel(Logger):
         self.hm.send_settle(htlc_id)
 
     def get_payment_hash(self, htlc_id):
-        log = self.hm.log[REMOTE]
+        log = self.hm.log[LOCAL]
         htlc = log['adds'][htlc_id]
         return htlc.payment_hash
 
diff --git a/electrum/lnworker.py b/electrum/lnworker.py
index e218f55ba..bf6b40095 100644
--- a/electrum/lnworker.py
+++ b/electrum/lnworker.py
@@ -1029,6 +1029,7 @@ class LNWallet(LNWorker):
 
     async def await_payment(self, payment_hash):
         success = await self.pending_payments[payment_hash]
+        self.pending_payments.pop(payment_hash)
         preimage = self.get_preimage(payment_hash)
         return success, preimage