diff --git a/electrum/lnworker.py b/electrum/lnworker.py
index 44170d4d4..652f01270 100644
--- a/electrum/lnworker.py
+++ b/electrum/lnworker.py
@@ -697,7 +697,6 @@ class LNWallet(LNWorker):
         self.sent_buckets = dict()                    # payment_key -> (amount_sent, amount_failed)
         self.received_mpp_htlcs = dict()              # type: Dict[bytes, ReceivedMPPStatus]  # payment_key -> ReceivedMPPStatus
 
-        self.swap_manager = SwapManager(wallet=self.wallet, lnworker=self)
         # detect inflight payments
         self.inflight_payments = set()        # (not persisted) keys of invoices that are in PR_INFLIGHT state
         for payment_hash in self.get_payments(status='inflight').keys():
@@ -710,6 +709,7 @@ class LNWallet(LNWorker):
         # payment_hash -> callback, timeout:
         self.hold_invoice_callbacks = {}                # type: Dict[bytes, Tuple[Callable[[bytes], None], int]]
         self.payment_bundles = []                       # lists of hashes. todo:persist
+        self.swap_manager = SwapManager(wallet=self.wallet, lnworker=self)
 
 
     def has_deterministic_node_id(self) -> bool:
diff --git a/electrum/submarine_swaps.py b/electrum/submarine_swaps.py
index 17ea412e2..58119e887 100644
--- a/electrum/submarine_swaps.py
+++ b/electrum/submarine_swaps.py
@@ -152,6 +152,8 @@ class SwapManager(Logger):
         for payment_hash, swap in self.swaps.items():
             swap._payment_hash = bytes.fromhex(payment_hash)
             self._add_or_reindex_swap(swap)
+            if not swap.is_reverse and not swap.is_redeemed:
+                self.lnworker.register_callback_for_hold_invoice(payment_hash, self.hold_invoice_callback)
 
         self.prepayments = {}  # type: Dict[bytes, bytes] # fee_rhash -> rhash
         for k, swap in self.swaps.items():