diff --git a/client.go b/client.go
index 45ae9f6..b00a25d 100644
--- a/client.go
+++ b/client.go
@@ -152,6 +152,7 @@ func NewClient(dbDir string, cfg *ClientConfig) (*Client, func(), error) {
 		loopOutMaxParts:   cfg.LoopOutMaxParts,
 		routingHints:      cfg.LoopOutRoutingHints,
 		cancelSwap:        swapServerClient.CancelLoopOutSwap,
+		getHints:          swapServerClient.loopOutHints,
 	})
 
 	client := &Client{
diff --git a/executor.go b/executor.go
index 70bd2b5..44e9138 100644
--- a/executor.go
+++ b/executor.go
@@ -8,6 +8,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/btcutil"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop/loopdb"
 	"github.com/lightninglabs/loop/sweep"
@@ -28,6 +29,9 @@ type executorConfig struct {
 	routingHints    bool
 
 	cancelSwap func(ctx context.Context, details *outCancelDetails) error
+
+	getHints func(context.Context, btcutil.Amount, int) (
+		[]*loopOutHint, error)
 }
 
 // executor is responsible for executing swaps.
@@ -149,6 +153,7 @@ func (s *executor) run(mainCtx context.Context,
 					loopOutMaxParts: s.executorConfig.loopOutMaxParts,
 					routingHints:    s.executorConfig.routingHints,
 					cancelSwap:      s.executorConfig.cancelSwap,
+					getHints:        s.executorConfig.getHints,
 				}, height)
 				if err != nil && err != context.Canceled {
 					log.Errorf("Execute error: %v", err)
diff --git a/loopout.go b/loopout.go
index bf0af02..478b13f 100644
--- a/loopout.go
+++ b/loopout.go
@@ -87,6 +87,8 @@ type executeConfig struct {
 	loopOutMaxParts uint32
 	routingHints    bool
 	cancelSwap      func(context.Context, *outCancelDetails) error
+	getHints        func(context.Context, btcutil.Amount, int) (
+		[]*loopOutHint, error)
 }
 
 // loopOutInitResult contains information about a just-initiated loop out swap.
diff --git a/testcontext_test.go b/testcontext_test.go
index 5a71d97..96680b4 100644
--- a/testcontext_test.go
+++ b/testcontext_test.go
@@ -53,6 +53,7 @@ func newSwapClient(config *clientConfig) *Client {
 		sweeper:           sweeper,
 		createExpiryTimer: config.CreateExpiryTimer,
 		cancelSwap:        config.Server.CancelLoopOutSwap,
+		getHints:          config.Server.loopOutHints,
 	})
 
 	return &Client{