diff --git a/artifacts/definitions/Server/Utils/CreateCollector.yaml b/artifacts/definitions/Server/Utils/CreateCollector.yaml
index aac08f31ffb..29862c67836 100644
--- a/artifacts/definitions/Server/Utils/CreateCollector.yaml
+++ b/artifacts/definitions/Server/Utils/CreateCollector.yaml
@@ -413,7 +413,7 @@ sources:
       )
 
       LET use_server_cert = encryption_scheme =~ "x509"
-         AND NOT encryption_args.public_key =~ "----BEGIN CERTIFICATE-----"
+         AND NOT encryption_args.public_key =~ "-----BEGIN CERTIFICATE-----"
          AND log(message="Pubkey encryption specified, but no cert/key provided. Defaulting to server frontend cert")
 
       -- For x509, if no public key cert is specified, we use the
diff --git a/bin/offline.go b/bin/offline.go
index 62748b83e48..6a4d44cea76 100644
--- a/bin/offline.go
+++ b/bin/offline.go
@@ -177,6 +177,7 @@ SELECT * FROM Artifact.Server.Utils.CreateCollector(
    target=Spec.Target,
    target_args=Spec.TargetArgs,
    encryption_scheme=Spec.EncryptionScheme,
+   encryption_args=Spec.EncryptionArgs,
    opt_verbose=Spec.OptVerbose,
    opt_banner=Spec.OptBanner,
    opt_prompt=Spec.OptPrompt,