diff --git a/server/queue.go b/server/queue.go
index 155b9c039..43d5e08f6 100644
--- a/server/queue.go
+++ b/server/queue.go
@@ -145,8 +145,8 @@ func HandleUpdate(c context.Context, message *stomp.Message) {
 	}
 
 	defer func() {
-		client.Unsubscribe(sub)
 		client.Send(dest, []byte{}, stomp.WithRetain("remove"))
+		client.Unsubscribe(sub)
 	}()
 
 	select {