diff --git a/client.c b/client.c
index 226f22fe..a017e7a7 100644
--- a/client.c
+++ b/client.c
@@ -142,7 +142,6 @@ client_main(struct client_ctx *cctx)
 	logfile("client");
 
 	error = NULL;
-	xtimeout = INFTIM;
 	while (!sigterm) {
 		if (sigchld) {
 			waitpid(WAIT_ANY, NULL, WNOHANG);
diff --git a/server.c b/server.c
index b8c80fb3..c92426a4 100644
--- a/server.c
+++ b/server.c
@@ -288,7 +288,7 @@ server_main(int srv_fd)
 			xtimeout = POLL_TIMEOUT;
 
 		/* Do the poll. */
-		if ((nfds = poll(pfds, nfds, xtimeout)) == -1) {
+		if (poll(pfds, nfds, xtimeout) == -1) {
 			if (errno == EAGAIN || errno == EINTR)
 				continue;
 			fatal("poll failed");