diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index f32a4c41e6..b344f72c01 100755
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -1870,7 +1870,7 @@ class Build():
                         self.UniFlag,
                         self.Progress
                         )
-                GenerateStackCookieValues() # MU_CHANGE [BEGIN]: Add build-time random stack cookie support
+                GenerateStackCookieValues() # MU_CHANGE: Add build-time random stack cookie support
                 self.Fdf = Wa.FdfFile
                 self.LoadFixAddress = Wa.Platform.LoadFixAddress
                 self.BuildReport.AddPlatformReport(Wa)
@@ -1974,6 +1974,7 @@ class Build():
                         self.Progress,
                         self.ModuleFile
                         )
+                GenerateStackCookieValues() # MU_CHANGE: Add build-time random stack cookie support
                 self.Fdf = Wa.FdfFile
                 self.LoadFixAddress = Wa.Platform.LoadFixAddress
                 Wa.CreateMakeFile(False)
@@ -2224,7 +2225,7 @@ class Build():
                 self.UniFlag,
                 self.Progress
                 )        
-        GenerateStackCookieValues() # MU_CHANGE [BEGIN]: Add build-time random stack cookie support
+        GenerateStackCookieValues() # MU_CHANGE: Add build-time random stack cookie support
         self.Fdf = Wa.FdfFile
         self.LoadFixAddress = Wa.Platform.LoadFixAddress
         self.BuildReport.AddPlatformReport(Wa)