diff --git a/cli/internal/cmd/apply.go b/cli/internal/cmd/apply.go
index 199cc1d3b..439bf5708 100644
--- a/cli/internal/cmd/apply.go
+++ b/cli/internal/cmd/apply.go
@@ -14,7 +14,6 @@ import (
 	"io"
 	"io/fs"
 	"log/slog"
-	"net"
 	"os"
 	"path/filepath"
 	"slices"
@@ -229,7 +228,7 @@ func runApply(cmd *cobra.Command, _ []string) error {
 	}
 
 	newDialer := func(validator atls.Validator) *dialer.Dialer {
-		return dialer.New(nil, validator, &net.Dialer{})
+		return dialer.New(nil, validator, nil)
 	}
 
 	upgradeID := generateUpgradeID(upgradeCmdKindApply)
diff --git a/cli/internal/cmd/recover.go b/cli/internal/cmd/recover.go
index 17ffa4c32..e8c9f83a6 100644
--- a/cli/internal/cmd/recover.go
+++ b/cli/internal/cmd/recover.go
@@ -11,7 +11,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"net"
 	"sync"
 	"time"
 
@@ -78,7 +77,7 @@ func runRecover(cmd *cobra.Command, _ []string) error {
 	}
 	fileHandler := file.NewHandler(afero.NewOsFs())
 	newDialer := func(validator atls.Validator) *dialer.Dialer {
-		return dialer.New(nil, validator, &net.Dialer{})
+		return dialer.New(nil, validator, nil)
 	}
 	r := &recoverCmd{log: log, configFetcher: attestationconfigapi.NewFetcher()}
 	if err := r.flags.parse(cmd.Flags()); err != nil {
diff --git a/cli/internal/cmd/verify.go b/cli/internal/cmd/verify.go
index 523920a20..264e794c2 100644
--- a/cli/internal/cmd/verify.go
+++ b/cli/internal/cmd/verify.go
@@ -108,7 +108,7 @@ func runVerify(cmd *cobra.Command, _ []string) error {
 
 	fileHandler := file.NewHandler(afero.NewOsFs())
 	verifyClient := &constellationVerifier{
-		dialer: dialer.New(nil, nil, &net.Dialer{}),
+		dialer: dialer.New(nil, nil, nil),
 		log:    log,
 	}
 
diff --git a/internal/grpc/dialer/dialer.go b/internal/grpc/dialer/dialer.go
index 44bf33d87..a04e56310 100644
--- a/internal/grpc/dialer/dialer.go
+++ b/internal/grpc/dialer/dialer.go
@@ -67,6 +67,9 @@ func (d *Dialer) DialNoVerify(target string) (*grpc.ClientConn, error) {
 }
 
 func (d *Dialer) grpcWithDialer() grpc.DialOption {
+	if d.netDialer == nil {
+		return grpc.EmptyDialOption{}
+	}
 	return grpc.WithContextDialer(func(ctx context.Context, addr string) (net.Conn, error) {
 		return d.netDialer.DialContext(ctx, "tcp", addr)
 	})
diff --git a/terraform-provider-constellation/internal/provider/cluster_resource.go b/terraform-provider-constellation/internal/provider/cluster_resource.go
index 978771e83..c002ccad5 100644
--- a/terraform-provider-constellation/internal/provider/cluster_resource.go
+++ b/terraform-provider-constellation/internal/provider/cluster_resource.go
@@ -15,7 +15,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"net"
 	"net/url"
 	"regexp"
 	"strings"
@@ -550,7 +549,7 @@ func (r *ClusterResource) Configure(_ context.Context, req resource.ConfigureReq
 	}
 
 	newDialer := func(validator atls.Validator) *dialer.Dialer {
-		return dialer.New(nil, validator, &net.Dialer{})
+		return dialer.New(nil, validator, nil)
 	}
 
 	r.newApplier = func(ctx context.Context, _ atls.Validator) *constellation.Applier {