diff --git a/beetsplug/spotify.py b/beetsplug/spotify.py
index b95546dd2..2d3b7c975 100644
--- a/beetsplug/spotify.py
+++ b/beetsplug/spotify.py
@@ -658,8 +658,9 @@ class SpotifyPlugin(MetadataSourcePlugin, BeetsPlugin):
     def track_audio_features(self, track_id=None):
         """Fetch track audio features by its Spotify ID."""
         try:
-            return self._handle_response(
+            track_features = self._handle_response(
                 requests.get, self.audio_features_url + track_id)
         except SpotifyAPIError as e:
             self._log.debug('Spotify API error: {}', e)
-            return None
+            track_features = None
+        return track_features