diff --git a/electrum/gui/kivy/main_window.py b/electrum/gui/kivy/main_window.py
index 9414dbc40..6d7302f3c 100644
--- a/electrum/gui/kivy/main_window.py
+++ b/electrum/gui/kivy/main_window.py
@@ -207,7 +207,7 @@ class ElectrumWindow(App):
         self._trigger_update_history()
 
     def on_request_status(self, event, key, status):
-        if key not in self.wallet.requests:
+        if key not in self.wallet.receive_requests:
             return
         self.update_tab('receive')
         if self.request_popup and self.request_popup.key == key:
diff --git a/electrum/gui/kivy/uix/screens.py b/electrum/gui/kivy/uix/screens.py
index 507d1e713..bf38692dc 100644
--- a/electrum/gui/kivy/uix/screens.py
+++ b/electrum/gui/kivy/uix/screens.py
@@ -448,9 +448,7 @@ class ReceiveScreen(CScreen):
         amount = self.app.get_amount(amount) if amount else 0
         message = self.screen.message
         if lightning:
-            payment_hash = self.app.wallet.lnworker.add_invoice(amount, message, self.expiry())
-            request, direction, is_paid = self.app.wallet.lnworker.invoices.get(payment_hash.hex())
-            key = payment_hash.hex()
+            key = self.app.wallet.lnworker.add_request(amount, message, self.expiry())
         else:
             addr = self.screen.address or self.app.wallet.get_unused_address()
             if not addr: