diff --git a/ipn/ipnserver/server.go b/ipn/ipnserver/server.go
index 06944371c..c18817067 100644
--- a/ipn/ipnserver/server.go
+++ b/ipn/ipnserver/server.go
@@ -516,6 +516,7 @@ func (s *Server) Run(ctx context.Context, ln net.Listener) error {
 		if err := ctx.Err(); err != nil {
 			return err
 		}
+		return err
 	}
 	return nil
 }