diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index e8d8e6f828..0ba6fa9d5e 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -4701,7 +4701,8 @@ enable_statement_timeout(void)
 
 	if (StatementTimeout > 0)
 	{
-		if (!stmt_timeout_active)
+		if (!doing_extended_query_message ||
+			(!stmt_timeout_active && doing_extended_query_message))
 		{
 			enable_timeout_after(STATEMENT_TIMEOUT, StatementTimeout);
 			stmt_timeout_active = true;