diff --git a/beetsplug/chroma.py b/beetsplug/chroma.py
index 8c9968c34..036024b57 100644
--- a/beetsplug/chroma.py
+++ b/beetsplug/chroma.py
@@ -126,3 +126,4 @@ class AcoustidPlugin(plugins.BeetsPlugin):
             return [track]
         else:
             log.debug('no acoustid item candidate found')
+            return []
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2aacaf369..8562391cb 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -23,6 +23,8 @@ Changelog
   MusicBrainz IDs).
 * Fix another crash with non-ASCII characters in the configuration paths.
 * Fix a divide-by-zero crash on zero-length audio files.
+* Fix a crash in the ``chroma`` plugin when the Acoustid database had no
+  recording associated with a fingerprint.
 
 
 1.0b12 (January 16, 2012)