Fix server keepalive with watch task