diff --git a/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/EdgeStacksStatus.tsx b/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/EdgeStacksStatus.tsx
index 280ee8d77..565eac41e 100644
--- a/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/EdgeStacksStatus.tsx
+++ b/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/EdgeStacksStatus.tsx
@@ -65,7 +65,7 @@ function getStatus(
     };
   }
 
-  if (envStatus.length < numDeployments) {
+  if (!envStatus.length) {
     return {
       label: 'Deploying',
       icon: Loader2,
@@ -84,6 +84,15 @@ function getStatus(
     };
   }
 
+  if (envStatus.length < numDeployments) {
+    return {
+      label: 'Deploying',
+      icon: Loader2,
+      spin: true,
+      mode: 'primary',
+    };
+  }
+
   const allCompleted = envStatus.every((s) => s.Type === StatusType.Completed);
 
   if (allCompleted) {