diff --git a/beetsplug/chroma.py b/beetsplug/chroma.py
index b7a1ec781..6c39f0d6c 100644
--- a/beetsplug/chroma.py
+++ b/beetsplug/chroma.py
@@ -181,9 +181,11 @@ def fingerprint_task(task, session):
     """Fingerprint each item in the task for later use during the
     autotagging candidate search.
     """
-    items = task.items if task.is_album else [task.item]
-    for item in items:
-        acoustid_match(item.path)
+    auto = config['acoustid']['auto']
+    if auto:
+        items = task.items if task.is_album else [task.item]
+        for item in items:
+            acoustid_match(item.path)
 
 
 @AcoustidPlugin.listen('import_task_apply')
diff --git a/docs/plugins/chroma.rst b/docs/plugins/chroma.rst
index 20ff1882a..dca773e18 100644
--- a/docs/plugins/chroma.rst
+++ b/docs/plugins/chroma.rst
@@ -93,7 +93,11 @@ Using
 Once you have all the dependencies sorted out, you can enable fingerprinting by
 editing your :doc:`configuration file </reference/config>`. Put ``chroma`` on
 your ``plugins:`` line. With that, beets will use fingerprinting the next time
-you run ``beet import``.
+you run ``beet import``. This can be disabled by setting the ``auto`` option to
+false, like so::
+
+    acoustid:
+        auto: no
 
 You can also use the ``beet fingerprint`` command to generate fingerprints for
 items already in your library. (Provide a query to fingerprint a subset of your