diff --git a/electrum/gui/qt/invoice_list.py b/electrum/gui/qt/invoice_list.py
index 358f36fa8..f0d16805b 100644
--- a/electrum/gui/qt/invoice_list.py
+++ b/electrum/gui/qt/invoice_list.py
@@ -71,6 +71,8 @@ class InvoiceList(MyTreeView):
         for idx, pr in enumerate(inv_list):
             key = pr.get_id()
             status = self.parent.invoices.get_status(key)
+            if status is None:
+                continue
             requestor = pr.get_requestor()
             exp = pr.get_expiration_date()
             date_str = format_time(exp) if exp else _('Never')
diff --git a/electrum/paymentrequest.py b/electrum/paymentrequest.py
index f94920a4d..ee29e6182 100644
--- a/electrum/paymentrequest.py
+++ b/electrum/paymentrequest.py
@@ -537,4 +537,7 @@ class InvoiceStore(object):
         return self.invoices.values()
 
     def unpaid_invoices(self):
-        return [ self.invoices[k] for k in filter(lambda x: self.get_status(x)!=PR_PAID, self.invoices.keys())]
+        return [self.invoices[k] for k in
+                filter(lambda x: self.get_status(x) not in (PR_PAID, None),
+                       self.invoices.keys())
+                ]