diff --git a/bootstrap/service.go b/bootstrap/service.go index 2f87d1ae57..aae7d1bf3b 100644 --- a/bootstrap/service.go +++ b/bootstrap/service.go @@ -325,6 +325,10 @@ func (bs bootstrapService) ChangeState(ctx context.Context, token, id string, st ThingID: cfg.ThingID, } if err := bs.sdk.Connect(conIDs, token); err != nil { + // Ignore conflict errors as they indicate the connection already exists. + if errors.Contains(err, svcerr.ErrConflict) { + continue + } return ErrThings } }