diff --git a/pkg/corredor/healthcheck.go b/pkg/corredor/healthcheck.go
index bd10edd00..5b0dc5fbf 100644
--- a/pkg/corredor/healthcheck.go
+++ b/pkg/corredor/healthcheck.go
@@ -19,6 +19,13 @@ func Healthcheck(_ context.Context) error {
 		return nil
 	}
 
+	if svc.conn == nil {
+		// working around edge-case where health-check is called
+		// but conn variable is not set;
+		// prevents nil pointer dereference error
+		return nil
+	}
+
 	if state := svc.conn.GetState(); state != connectivity.Ready {
 		return fmt.Errorf("connection is %s", state)
 	}