diff --git a/client/common/client.c b/client/common/client.c
index 95e1a84b8..a847c9b34 100644
--- a/client/common/client.c
+++ b/client/common/client.c
@@ -409,6 +409,9 @@ static DWORD client_cli_accept_certificate(rdpSettings* settings)
 {
 	char answer;
 
+	if (settings->CredentialsFromStdin)
+		return 0;
+
 	while (1)
 	{
 		printf("Do you trust the above certificate? (Y/T/N) ");