diff --git a/frontend/saned.c b/frontend/saned.c
index 5ca81cc26..7e0e580b8 100644
--- a/frontend/saned.c
+++ b/frontend/saned.c
@@ -3384,6 +3384,7 @@ run_standalone (char *user)
 		else if (fd >= 0)
 		  {
 		    handle_client (fd);
+		    poll_set_valid = SANE_FALSE; /* We will expect to add a pidfd */
 		    if (run_once == SANE_TRUE)
 		      running = SANE_FALSE; /* We have handled the only connection we're going to handle */
 		  }