diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index 8524acd1ffdb..f56432f4e733 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -161,8 +161,10 @@ main(argc, argv)
 			av[1] = "-l";
 			comp = &av[0];
 		}
-		else if (++ap == av + ENTRIES)
+		else if (++ap == av + ENTRIES) {
+			*ap = NULL;
 			break;
+		}
 		lp = NULL;
 	}