diff --git a/libs/gi/page-team/src/CharacterDisplay/Tabs/TabOptimize/Components/BuildAlert.tsx b/libs/gi/page-team/src/CharacterDisplay/Tabs/TabOptimize/Components/BuildAlert.tsx
index 21600dfffd..dd0dd77680 100644
--- a/libs/gi/page-team/src/CharacterDisplay/Tabs/TabOptimize/Components/BuildAlert.tsx
+++ b/libs/gi/page-team/src/CharacterDisplay/Tabs/TabOptimize/Components/BuildAlert.tsx
@@ -55,7 +55,7 @@ export default function BuildAlert({
   let progress = undefined as undefined | number
 
   if (generatingBuilds) {
-    progress = (tested * 100) / unskipped
+    progress = ((tested + skipped) / total) * 100
     title = (
       <Typography>
         Generating and testing {testedString}
diff --git a/libs/gi/ui/src/components/character/BuildAlert.tsx b/libs/gi/ui/src/components/character/BuildAlert.tsx
index 0f36d142f7..6a3efac99d 100644
--- a/libs/gi/ui/src/components/character/BuildAlert.tsx
+++ b/libs/gi/ui/src/components/character/BuildAlert.tsx
@@ -69,7 +69,7 @@ export function BuildAlert({
   let progress = undefined as undefined | number
 
   if (generatingBuilds) {
-    progress = (tested * 100) / unskipped
+    progress = ((tested + skipped) / total) * 100
     title = (
       <Typography>
         Generating and testing {testedString}