diff --git a/loopd/swapclient_server.go b/loopd/swapclient_server.go
index 3b7cbc0..6e2945f 100644
--- a/loopd/swapclient_server.go
+++ b/loopd/swapclient_server.go
@@ -190,10 +190,10 @@ func (s *swapClientServer) Monitor(in *looprpc.MonitorRequest,
 	s.swapsLock.Unlock()
 
 	defer func() {
-		queue.Stop()
 		s.swapsLock.Lock()
 		delete(s.subscribers, id)
 		s.swapsLock.Unlock()
+		queue.Stop()
 	}()
 
 	// Sort completed swaps new to old.
@@ -459,6 +459,7 @@ func (s *swapClientServer) processStatusUpdates(mainCtx context.Context) {
 				select {
 				case subscriber <- swp:
 				case <-mainCtx.Done():
+					s.swapsLock.Unlock()
 					return
 				}
 			}