diff --git a/cmd/lncli/main.go b/cmd/lncli/main.go
index d06c2de8..30aa2485 100644
--- a/cmd/lncli/main.go
+++ b/cmd/lncli/main.go
@@ -136,7 +136,7 @@ func getClientConn(ctx *cli.Context, skipMacaroons bool) *grpc.ClientConn {
 	// We need to use a custom dialer so we can also connect to unix sockets
 	// and not just TCP addresses.
 	genericDialer := lncfg.ClientAddressDialer(defaultRPCPort)
-	opts = append(opts, grpc.WithDialer(genericDialer))
+	opts = append(opts, grpc.WithContextDialer(genericDialer))
 	opts = append(opts, grpc.WithDefaultCallOptions(maxMsgRecvSize))
 
 	conn, err := grpc.Dial(ctx.GlobalString("rpcserver"), opts...)
diff --git a/lncfg/address.go b/lncfg/address.go
index 5a5a07fd..7fe2d71d 100644
--- a/lncfg/address.go
+++ b/lncfg/address.go
@@ -1,13 +1,13 @@
 package lncfg
 
 import (
+	"context"
 	"crypto/tls"
 	"encoding/hex"
 	"fmt"
 	"net"
 	"strconv"
 	"strings"
-	"time"
 
 	"github.com/btcsuite/btcd/btcec"
 	"github.com/lightningnetwork/lnd/lnwire"
@@ -274,8 +274,10 @@ func verifyPort(address string, defaultPort string) string {
 
 // ClientAddressDialer creates a gRPC dialer that can also dial unix socket
 // addresses instead of just TCP addresses.
-func ClientAddressDialer(defaultPort string) func(string, time.Duration) (net.Conn, error) {
-	return func(addr string, timeout time.Duration) (net.Conn, error) {
+func ClientAddressDialer(defaultPort string) func(context.Context,
+	string) (net.Conn, error) {
+
+	return func(ctx context.Context, addr string) (net.Conn, error) {
 		parsedAddr, err := ParseAddressString(
 			addr, defaultPort, net.ResolveTCPAddr,
 		)
@@ -283,8 +285,9 @@ func ClientAddressDialer(defaultPort string) func(string, time.Duration) (net.Co
 			return nil, err
 		}
 
-		return net.DialTimeout(
-			parsedAddr.Network(), parsedAddr.String(), timeout,
+		d := net.Dialer{}
+		return d.DialContext(
+			ctx, parsedAddr.Network(), parsedAddr.String(),
 		)
 	}
 }