diff --git a/beetsplug/echonest.py b/beetsplug/echonest.py
index c3843b752..9bed08822 100644
--- a/beetsplug/echonest.py
+++ b/beetsplug/echonest.py
@@ -271,7 +271,10 @@ class EchonestMetadataPlugin(plugins.BeetsPlugin):
                     buckets=['id:musicbrainz', 'audio_summary'])
             if not songs:
                 raise Exception(u'could not get songs from track ID')
-            return self._pick_song(songs, item)
+            # It seems like _pick_song fails even if we have a good match.  So
+            # just return the first song.
+            # return self._pick_song(songs, item)
+            return songs[0]
         except Exception as exc:
             log.debug(u'echonest: profile failed: {0}'.format(str(exc)))
             return None