diff --git a/box.go b/box.go index d3e0778d1..dc0a6d13a 100644 --- a/box.go +++ b/box.go @@ -170,7 +170,10 @@ func New(options Options) (*Box, error) { var internalServices []adapter.LifecycleService certificateOptions := common.PtrValueOrDefault(options.Certificate) - if C.IsAndroid || C.IsDarwin || certificateOptions.Store != "" { + if C.IsAndroid || certificateOptions.Store != "" && certificateOptions.Store != C.CertificateStoreSystem || + len(certificateOptions.Certificate) > 0 || + len(certificateOptions.CertificatePath) > 0 || + len(certificateOptions.CertificateDirectoryPath) > 0 { certificateStore, err := certificate.NewStore(ctx, logFactory.NewLogger("certificate"), certificateOptions) if err != nil { return nil, err