diff --git a/core/external_info.go b/core/external_info.go
index af707f599..38b6e46b5 100644
--- a/core/external_info.go
+++ b/core/external_info.go
@@ -76,7 +76,7 @@ func (e *externalInfo) callArtistInfo(ctx context.Context, artist *model.Artist,
 		go func() {
 			start := time.Now()
 			defer wg.Done()
-			lfmArtist, err := e.lfm.ArtistGetInfo(nil, artist.Name)
+			lfmArtist, err := e.lfm.ArtistGetInfo(ctx, artist.Name)
 			if err != nil {
 				log.Error(ctx, "Error calling Last.FM", "artist", artist.Name, err)
 			} else {
@@ -97,7 +97,7 @@ func (e *externalInfo) callArtistImages(ctx context.Context, artist *model.Artis
 		go func() {
 			start := time.Now()
 			defer wg.Done()
-			spfImages, err := e.spf.ArtistImages(nil, artist.Name)
+			spfImages, err := e.spf.ArtistImages(ctx, artist.Name)
 			if err != nil {
 				log.Error(ctx, "Error calling Spotify", "artist", artist.Name, err)
 			} else {
diff --git a/core/spotify/client_test.go b/core/spotify/client_test.go
index 8aaa1795e..29f090a08 100644
--- a/core/spotify/client_test.go
+++ b/core/spotify/client_test.go
@@ -75,7 +75,7 @@ var _ = Describe("Client", func() {
 				Body:       ioutil.NopCloser(bytes.NewBufferString(`{"access_token": "NEW_ACCESS_TOKEN","token_type": "Bearer","expires_in": 3600}`)),
 			})
 
-			token, err := client.authorize(nil)
+			token, err := client.authorize(context.TODO())
 			Expect(err).To(BeNil())
 			Expect(token).To(Equal("NEW_ACCESS_TOKEN"))
 			auth := httpClient.lastRequest.Header.Get("Authorization")
@@ -88,7 +88,7 @@ var _ = Describe("Client", func() {
 				Body:       ioutil.NopCloser(bytes.NewBufferString(`{"error":"invalid_client","error_description":"Invalid client"}`)),
 			})
 
-			_, err := client.authorize(nil)
+			_, err := client.authorize(context.TODO())
 			Expect(err).To(MatchError("spotify error(invalid_client): Invalid client"))
 		})
 
@@ -98,7 +98,7 @@ var _ = Describe("Client", func() {
 				Body:       ioutil.NopCloser(bytes.NewBufferString(`{NOT_VALID}`)),
 			})
 
-			_, err := client.authorize(nil)
+			_, err := client.authorize(context.TODO())
 			Expect(err).To(MatchError("invalid character 'N' looking for beginning of object key string"))
 		})
 	})