diff --git a/loopd/daemon.go b/loopd/daemon.go
index 96af9d90..5f7d2580 100644
--- a/loopd/daemon.go
+++ b/loopd/daemon.go
@@ -638,6 +638,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 			Store:                                staticAddressLoopInStore,
 			WalletKit:                            d.lnd.WalletKit,
 			ChainNotifier:                        d.lnd.ChainNotifier,
+			NotificationManager:                  notificationManager,
 			ChainParams:                          d.lnd.ChainParams,
 			Signer:                               d.lnd.Signer,
 			ValidateLoopInContract:               loop.ValidateLoopInContract,
diff --git a/loopd/swapclient_server.go b/loopd/swapclient_server.go
index 809ad7a5..6eb5beef 100644
--- a/loopd/swapclient_server.go
+++ b/loopd/swapclient_server.go
@@ -1796,14 +1796,11 @@ func toClientStaticAddressLoopInState(
 	case loopin.HtlcTimeoutSwept:
 		return looprpc.StaticAddressLoopInSwapState_HTLC_STATIC_ADDRESS_TIMEOUT_SWEPT
 
-	case loopin.FetchSignPushSweeplessSweepTx:
-		return looprpc.StaticAddressLoopInSwapState_FETCH_SIGN_PUSH_SWEEPLESS_SWEEP_TX
-
 	case loopin.Succeeded:
 		return looprpc.StaticAddressLoopInSwapState_SUCCEEDED
 
-	case loopin.SucceededSweeplessSigFailed:
-		return looprpc.StaticAddressLoopInSwapState_SUCCEEDED_SWEEPLESS_SIG_FAILED
+	case loopin.SucceededTransitioningFailed:
+		return looprpc.StaticAddressLoopInSwapState_SUCCEEDED_TRANSITIONING_FAILED
 
 	case loopin.UnlockDeposits:
 		return looprpc.StaticAddressLoopInSwapState_UNLOCK_DEPOSITS