diff --git a/eng/Common.targets b/eng/Common.targets
index 5dedc41e6d2..484f9ba4932 100644
--- a/eng/Common.targets
+++ b/eng/Common.targets
@@ -25,10 +25,10 @@
 
   <Target Name="CustomizeVersions" AfterTargets="MinVer" Condition="'$(GITHUB_ACTIONS)' == 'true'">
     <PropertyGroup>
-      <FileVersion>$([MSBuild]::ValueOrDefault('$(MinVerMajor)', '8')).$([MSBuild]::ValueOrDefault('$(MinVerMinor)', '6')).$([MSBuild]::ValueOrDefault('$(MinVerPatch)', '0')).$(GITHUB_RUN_NUMBER)</FileVersion>
+      <FileVersion>$([MSBuild]::ValueOrDefault('$(MinVerMajor)', '8')).$([MSBuild]::ValueOrDefault('$(MinVerMinor)', '6')).$([MSBuild]::ValueOrDefault('$(MinVerPatch)', '0')).$([MSBuild]::ValueOrDefault('$(GITHUB_RUN_NUMBER)', '0'))</FileVersion>
     </PropertyGroup>
     <PropertyGroup Condition="$(GITHUB_REF.StartsWith(`refs/pull/`))">
-      <PackageVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch)-pr.$(GITHUB_REF_NAME.Replace(`/merge`, ``)).$(GITHUB_RUN_NUMBER)</PackageVersion>
+      <PackageVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch)-pr.$(GITHUB_REF_NAME.Replace(`/merge`, ``)).$([MSBuild]::ValueOrDefault('$(GITHUB_RUN_NUMBER)', '0'))</PackageVersion>
     </PropertyGroup>
   </Target>