diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
index e4f8cae1fd6..2bf9c484803 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -12,7 +12,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"context"
+	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 
 	"github.com/grafana/grafana/pkg/bus"
diff --git a/pkg/social/social.go b/pkg/social/social.go
index 5b966973be4..860d068957e 100644
--- a/pkg/social/social.go
+++ b/pkg/social/social.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"strings"
 
-	"context"
+	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 
 	"github.com/grafana/grafana/pkg/setting"