diff --git a/.buildkite/hooks/pre-command.ps1 b/.buildkite/hooks/pre-command.ps1
index 44a595dd918..e3a6257b2f1 100644
--- a/.buildkite/hooks/pre-command.ps1
+++ b/.buildkite/hooks/pre-command.ps1
@@ -1,3 +1,6 @@
+# Shorten BUILDKITE_MESSAGE if needed to avoid filling the Windows env var buffer
+$env:BUILDKITE_MESSAGE = $env:BUILDKITE_MESSAGE.Substring(0, [System.Math]::Min(2048, $env:BUILDKITE_MESSAGE.Length))
+
 # Install gcc TODO: Move to the VM image
 choco install mingw
 Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1