diff --git a/src/main/java/com/aws/greengrass/status/FleetStatusService.java b/src/main/java/com/aws/greengrass/status/FleetStatusService.java
index 50c5cf0691..713961fc64 100644
--- a/src/main/java/com/aws/greengrass/status/FleetStatusService.java
+++ b/src/main/java/com/aws/greengrass/status/FleetStatusService.java
@@ -398,6 +398,8 @@ private void updatePeriodicFleetStatusData() {
      * Trigger a Fleet Status update at kernel launch.
      */
     public void triggerFleetStatusUpdateAtKernelLaunch() {
+        // kernel launch indicates FSS setup is completed
+        isLaunchMessageSent.set(true);
         if (!deviceConfiguration.isDeviceConfiguredToTalkToCloud()) {
             logger.atWarn().kv("trigger", Trigger.NUCLEUS_LAUNCH).log("Status won't be published until Nucleus is "
                     + "configured online");
@@ -524,7 +526,6 @@ private void uploadFleetStatusServiceData(Set<GreengrassService> greengrassServi
             logger.atDebug().log("Not updating fleet status data since FSS is being set up");
             return;
         }
-        isLaunchMessageSent.compareAndSet(false, true);
 
         if (!isConnected.get() && !Trigger.isCloudDeploymentTrigger(trigger)) {
             logger.atDebug().log("Not updating fleet status data since MQTT connection is interrupted");