diff --git a/beetsplug/keyfinder.py b/beetsplug/keyfinder.py
index 34a4abca4b..a3fbc82114 100644
--- a/beetsplug/keyfinder.py
+++ b/beetsplug/keyfinder.py
@@ -48,7 +48,7 @@ def command(self, lib, opts, args):
         self.find_key(lib.items(ui.decargs(args)), write=ui.should_write())
 
     def imported(self, session, task):
-        self.find_key(task.items)
+        self.find_key(task.imported_items())
 
     def find_key(self, items, write=False):
         overwrite = self.config['overwrite'].get(bool)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8f45aa69c4..12fee62c8f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -103,6 +103,8 @@ Fixes:
   to which a track belongs, not the total number of different mediums present
   on the release. :bug:`2887`
   Thanks to :user:`dbogdanov`.
+* :doc:`/plugins/keyfinder`: Avoid a crash when trying to process unmatched
+  tracks. :bug:`2537`
 
 
 For developers: