diff --git a/ci/deploy.ps1 b/ci/deploy.ps1
index 0c7520b9..a779b673 100644
--- a/ci/deploy.ps1
+++ b/ci/deploy.ps1
@@ -104,7 +104,7 @@ pushd "spatial"
                             fields = @(
                                     @{
                                         title = "Build Message"
-                                        value = "$env:BUILDKITE_MESSAGE".Substring(0, 64)
+                                        value = "$env:BUILDKITE_MESSAGE".Substring(0, [System.Math]::Min(64, "$env:BUILDKITE_MESSAGE".Length)) 
                                         short = "true"
                                     }
                                     @{