diff --git a/beetsplug/lyrics.py b/beetsplug/lyrics.py
index 57083f96f..60f537597 100644
--- a/beetsplug/lyrics.py
+++ b/beetsplug/lyrics.py
@@ -772,7 +772,7 @@ class LyricsPlugin(plugins.BeetsPlugin):
         writing continuously to the same files.
         """
 
-        if item is None or slug(self.artist) != slug(item.artist):
+        if item is None or slug(self.artist) != slug(item.albumartist):
             if self.rest is not None:
                 path = os.path.join(directory, 'artists',
                                     slug(self.artist) + u'.rst')
@@ -781,7 +781,7 @@ class LyricsPlugin(plugins.BeetsPlugin):
                 self.rest = None
                 if item is None:
                     return
-            self.artist = item.artist.strip()
+            self.artist = item.albumartist.strip()
             self.rest = u"%s\n%s\n\n.. contents::\n   :local:\n\n" \
                         % (self.artist,
                            u'=' * len(self.artist))
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 63855eb48..9c8ecf55b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -54,6 +54,9 @@ Fixes:
   with Genius. :bug:`2771`
 * :doc:`/plugins/lyrics`: The ``lyrics`` command previously write ReST files
   by default. This default has been fixed.
+* :doc:`/plugins/lyrics`: When writing ReST files, the ``lyrics`` command
+  now groups lyrics by the ``albumartist`` field, rather than ``artist``.
+  :bug:`2924`
 * Plugins can now see updated import task state, such as when rejecting the
   initial candidates and finding new ones via a manual search. Notably, this
   means that the importer prompt options that the :doc:`/plugins/edit`