diff --git a/apps/server/AliasVault.Admin/Main/Components/WorkerStatus/ServiceControl.razor b/apps/server/AliasVault.Admin/Main/Components/WorkerStatus/ServiceControl.razor
index 0fd26b5b6..6a60fdd2f 100644
--- a/apps/server/AliasVault.Admin/Main/Components/WorkerStatus/ServiceControl.razor
+++ b/apps/server/AliasVault.Admin/Main/Components/WorkerStatus/ServiceControl.razor
@@ -128,7 +128,7 @@
         {
             buttonClass += "bg-emerald-500";
         }
-        else if (service.DesiredStatus == "Stopped" && (service.DesiredStatus == string.Empty || service.DesiredStatus == "Stopped"))
+        else if (service.CurrentStatus == "Stopped" && (service.DesiredStatus == string.Empty || service.DesiredStatus == "Stopped"))
         {
             buttonClass += "bg-red-600";
         }
diff --git a/apps/server/Utilities/AliasVault.WorkerStatus/StatusWorker.cs b/apps/server/Utilities/AliasVault.WorkerStatus/StatusWorker.cs
index ba8f416e3..a3dfb12a8 100644
--- a/apps/server/Utilities/AliasVault.WorkerStatus/StatusWorker.cs
+++ b/apps/server/Utilities/AliasVault.WorkerStatus/StatusWorker.cs
@@ -217,13 +217,15 @@ public class StatusWorker(ILogger<StatusWorker> logger, Func<IWorkerStatusDbCont
         var entry = new WorkerServiceStatus
         {
             ServiceName = globalServiceStatus.ServiceName,
-            CurrentStatus = Status.Started.ToString(),
-            DesiredStatus = string.Empty,
+            CurrentStatus = Status.Stopped.ToString(),
+            DesiredStatus = Status.Started.ToString(),
             Heartbeat = DateTime.UtcNow,
         };
         _dbContext.WorkerServiceStatuses.Add(entry);
         await _dbContext.SaveChangesAsync();
 
+        logger.LogInformation("Created initial status record for service {ServiceName} with CurrentStatus={CurrentStatus}, DesiredStatus={DesiredStatus}", globalServiceStatus.ServiceName, entry.CurrentStatus, entry.DesiredStatus);
+
         return entry;
     }
 }