diff --git a/rpcserver.go b/rpcserver.go
index 51acda6c..f2d87fff 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -2,6 +2,7 @@ package lnd
 
 import (
 	"bytes"
+	"context"
 	"crypto/tls"
 	"encoding/hex"
 	"errors"
@@ -55,7 +56,6 @@ import (
 	"github.com/lightningnetwork/lnd/sweep"
 	"github.com/lightningnetwork/lnd/zpay32"
 	"github.com/tv42/zbase32"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"gopkg.in/macaroon-bakery.v2/bakery"
 )