diff --git a/walletunlocker/service.go b/walletunlocker/service.go
index 3fe007cb..a4e030e0 100644
--- a/walletunlocker/service.go
+++ b/walletunlocker/service.go
@@ -1,6 +1,7 @@
 package walletunlocker
 
 import (
+	"context"
 	"crypto/rand"
 	"errors"
 	"fmt"
@@ -15,7 +16,6 @@ import (
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnwallet"
 	"github.com/lightningnetwork/lnd/lnwallet/btcwallet"
-	"golang.org/x/net/context"
 )
 
 // ChannelsToRecover wraps any set of packed (serialized+encrypted) channel
diff --git a/walletunlocker/service_test.go b/walletunlocker/service_test.go
index 525a2bdc..8eec845a 100644
--- a/walletunlocker/service_test.go
+++ b/walletunlocker/service_test.go
@@ -2,6 +2,7 @@ package walletunlocker_test
 
 import (
 	"bytes"
+	"context"
 	"io/ioutil"
 	"os"
 	"strings"
@@ -15,7 +16,6 @@ import (
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnwallet/btcwallet"
 	"github.com/lightningnetwork/lnd/walletunlocker"
-	"golang.org/x/net/context"
 )
 
 var (