diff --git a/cmd/maestro/server/healthcheck_server.go b/cmd/maestro/server/healthcheck_server.go
index 22f01875..8fb0b422 100755
--- a/cmd/maestro/server/healthcheck_server.go
+++ b/cmd/maestro/server/healthcheck_server.go
@@ -153,7 +153,7 @@ func (s *HealthCheckServer) checkInstances(ctx context.Context) {
 	inactiveInstanceIDs := []string{}
 	for _, instance := range instances {
 		// Instances pulsing within the last three check intervals are considered as active.
-		if instance.LastHeartbeat.After(time.Now().Add(time.Duration(int(-3*time.Second) * s.heartbeatInterval))) {
+		if instance.LastHeartbeat.After(time.Now().Add(time.Duration(int(-3*time.Second)*s.heartbeatInterval))) && !instance.Ready {
 			if s.brokerType == "mqtt" {
 				if err := s.statusDispatcher.OnInstanceUp(instance.ID); err != nil {
 					klog.Errorf("Error to call OnInstanceUp handler for maestro instance %s: %s", instance.ID, err.Error())
@@ -161,7 +161,7 @@ func (s *HealthCheckServer) checkInstances(ctx context.Context) {
 			}
 			// mark the instance as active after it is added to the status dispatcher
 			activeInstanceIDs = append(activeInstanceIDs, instance.ID)
-		} else {
+		} else if instance.LastHeartbeat.Before(time.Now().Add(time.Duration(int(-3*time.Second)*s.heartbeatInterval))) && instance.Ready {
 			if s.brokerType == "mqtt" {
 				if err := s.statusDispatcher.OnInstanceDown(instance.ID); err != nil {
 					klog.Errorf("Error to call OnInstanceDown handler for maestro instance %s: %s", instance.ID, err.Error())
diff --git a/test/integration/healthcheck_test.go b/test/integration/healthcheck_test.go
new file mode 100644
index 00000000..bf4acc21
--- /dev/null
+++ b/test/integration/healthcheck_test.go
@@ -0,0 +1,89 @@
+package integration
+
+import (
+	"context"
+	"fmt"
+	"testing"
+	"time"
+
+	. "github.com/onsi/gomega"
+	"github.com/openshift-online/maestro/pkg/api"
+	"github.com/openshift-online/maestro/pkg/dao"
+	"github.com/openshift-online/maestro/test"
+	prommodel "github.com/prometheus/client_model/go"
+	"k8s.io/apimachinery/pkg/util/rand"
+)
+
+func TestHealthCheckServer(t *testing.T) {
+	h, _ := test.RegisterIntegration(t)
+	ctx, cancel := context.WithCancel(context.Background())
+	defer func() {
+		cancel()
+	}()
+
+	instanceDao := dao.NewInstanceDao(&h.Env().Database.SessionFactory)
+	// insert one existing instances
+	_, err := instanceDao.Create(ctx, &api.ServerInstance{
+		Meta: api.Meta{
+			ID: "instance1",
+		},
+		LastHeartbeat: time.Now(),
+		Ready:         true,
+	})
+	Expect(err).NotTo(HaveOccurred())
+
+	// create a consumer
+	clusterName := "cluster-" + rand.String(5)
+	_ = h.CreateConsumer(clusterName)
+
+	instanceID := &h.Env().Config.MessageBroker.ClientID
+	Eventually(func() error {
+		instances, err := instanceDao.All(ctx)
+		if err != nil {
+			return err
+		}
+
+		if len(instances) != 2 {
+			return fmt.Errorf("expected 1 instance, got %d", len(instances))
+		}
+
+		var instance *api.ServerInstance
+		for _, i := range instances {
+			if i.ID == *instanceID {
+				instance = i
+			}
+		}
+
+		if instance.LastHeartbeat.IsZero() {
+			return fmt.Errorf("expected instance.LastHeartbeat to be non-zero")
+		}
+
+		if !instance.Ready {
+			return fmt.Errorf("expected instance.Ready to be true")
+		}
+
+		if instance.ID != *instanceID {
+			return fmt.Errorf("expected instance.ID to be %s, got %s", *instanceID, instance.ID)
+		}
+
+		return nil
+	}, 10*time.Second, 1*time.Second).Should(Succeed())
+
+	if h.Broker != "grpc" {
+		// check the metrics to ensure only status resync request is sent for manifets and manifestbundles
+		time.Sleep(2 * time.Second)
+		families := getServerMetrics(t, "http://localhost:8080/metrics")
+		labels := []*prommodel.LabelPair{
+			{Name: strPtr("source"), Value: strPtr("maestro")},
+			{Name: strPtr("cluster"), Value: strPtr(clusterName)},
+			{Name: strPtr("type"), Value: strPtr("io.open-cluster-management.works.v1alpha1.manifests")},
+		}
+		checkServerCounterMetric(t, families, "cloudevents_sent_total", labels, 1.0)
+		labels = []*prommodel.LabelPair{
+			{Name: strPtr("source"), Value: strPtr("maestro")},
+			{Name: strPtr("cluster"), Value: strPtr(clusterName)},
+			{Name: strPtr("type"), Value: strPtr("io.open-cluster-management.works.v1alpha1.manifestbundles")},
+		}
+		checkServerCounterMetric(t, families, "cloudevents_sent_total", labels, 1.0)
+	}
+}