diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py
index f3879e0dd..d6d444b5a 100644
--- a/picard/ui/mainwindow.py
+++ b/picard/ui/mainwindow.py
@@ -619,9 +619,7 @@ class MainWindow(QtGui.QMainWindow):
             if picard.musicdns.ofa and obj.can_analyze()\
                 and self.config.setting["fingerprinting_system"] == "musicdns":
                 can_analyze = True
-            if self.config.setting["acoustid_fpcalc"] and\
-                self.config.setting["acoustid_apikey"] and\
-                self.config.setting["fingerprinting_system"] == "acoustid" and\
+            if self.config.setting["fingerprinting_system"] == "acoustid" and\
                 obj.can_analyze():
                     can_analyze = True
             if obj.can_save():