diff --git a/CHANGELOG.md b/CHANGELOG.md
index 268c7c4..b9d962b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ Summary of release changes.
 - Updates method used for returning current script.
 - Updates info/error output for consistency.
 - Updates healthcheck failure messages to remove EOL character that is rendered in status response.
+- Updates wrapper script; only emit "waiting on" info message if bootstrap hasn't completed.
 - Adds improved test workflow; added `test-setup` target to Makefile.
 - Adds Makefile target `logsdef` to handle deferred logs output within a target chain.
 - Adds exec proxy function to `sshd-wrapper` used to pass through nice.
diff --git a/src/usr/sbin/sshd-wrapper b/src/usr/sbin/sshd-wrapper
index 2c6acc5..511349f 100755
--- a/src/usr/sbin/sshd-wrapper
+++ b/src/usr/sbin/sshd-wrapper
@@ -83,7 +83,8 @@ function main ()
 		__get_proxy
 	)"
 
-	if [[ ${verbose} == true ]]
+	if [[ ${verbose} == true ]] \
+		&& [[ ! -f ${bootstrap_state_file} ]]
 	then
 		printf -- \
 			'INFO: %s waiting on %s\n' \