diff --git a/experimental/libbox/command_client.go b/experimental/libbox/command_client.go
index a8d18495b..d4347e109 100644
--- a/experimental/libbox/command_client.go
+++ b/experimental/libbox/command_client.go
@@ -769,7 +769,7 @@ func (c *CommandClient) SubscribeTailscaleStatus(handler TailscaleStatusHandler)
 	for {
 		event, recvErr := stream.Recv()
 		if recvErr != nil {
-			if status.Code(recvErr) == codes.NotFound {
+			if status.Code(recvErr) == codes.NotFound || status.Code(recvErr) == codes.Unavailable {
 				return nil
 			}
 			recvErr = E.Cause(recvErr, "tailscale status recv")