diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 1476df4db285cd1982105f68230e5332a3e3a29b..94f92dd7343af74c37b7efe9f5f57a44f42c3d9e 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -571,6 +571,8 @@ InitPostgres(const char *in_dbname, Oid dboid, const char *username,
 	 */
 	if (!bootstrap)
 	{
+		/* statement_timestamp must be set for timeouts to work correctly */
+		SetCurrentStatementStartTimestamp();
 		StartTransactionCommand();
 		(void) GetTransactionSnapshot();
 	}