diff --git a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte
index 9c8181ec7c..a86de55423 100644
--- a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte
+++ b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte
@@ -42,7 +42,7 @@
 
 <div
   on:click
-  class:spectrum-ProgressCircle--indeterminate={!value}
+  class:spectrum-ProgressCircle--indeterminate={value == null}
   class:spectrum-ProgressCircle--overBackground={overBackground}
   class="spectrum-ProgressCircle spectrum-ProgressCircle--{convertSize(size)}"
 >
diff --git a/packages/builder/src/stores/portal/admin.js b/packages/builder/src/stores/portal/admin.js
index 24b8c31aab..152a7c6e3b 100644
--- a/packages/builder/src/stores/portal/admin.js
+++ b/packages/builder/src/stores/portal/admin.js
@@ -25,20 +25,14 @@ export function createAdminStore() {
         `/api/global/configs/checklist?tenantId=${tenantId}`
       )
       const json = await response.json()
-
-      const onboardingSteps = Object.keys(json)
-
-      const stepsComplete = onboardingSteps.reduce(
-        (score, step) => (score + step.checked ? 1 : 0),
-        0
-      )
+      const totalSteps = Object.keys(json).length
+      const completedSteps = Object.values(json).filter(x => x?.checked).length
 
       await getFlags()
       admin.update(store => {
         store.loaded = true
         store.checklist = json
-        store.onboardingProgress =
-          (stepsComplete / onboardingSteps.length) * 100
+        store.onboardingProgress = (completedSteps / totalSteps) * 100
         return store
       })
     } catch (err) {