diff --git a/server/service/endpoint_decorators.go b/server/service/endpoint_decorators.go
index 3628350d62..ecc5611e1e 100644
--- a/server/service/endpoint_decorators.go
+++ b/server/service/endpoint_decorators.go
@@ -1,9 +1,10 @@
 package service
 
 import (
+	"context"
+
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 type listDecoratorResponse struct {
diff --git a/server/service/transport_decorators.go b/server/service/transport_decorators.go
index c97a9ecdf6..8672edb857 100644
--- a/server/service/transport_decorators.go
+++ b/server/service/transport_decorators.go
@@ -1,10 +1,9 @@
 package service
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
-
-	"golang.org/x/net/context"
 )
 
 func decodeNewDecoratorRequest(ctx context.Context, req *http.Request) (interface{}, error) {