diff --git a/src/similarity/SimilaritySearcher.cpp b/src/similarity/SimilaritySearcher.cpp
index 190fc89a..20e183f1 100644
--- a/src/similarity/SimilaritySearcher.cpp
+++ b/src/similarity/SimilaritySearcher.cpp
@@ -45,7 +45,9 @@ Searcher::getSimilarTracks(Wt::Dbo::Session& session, const std::set<Database::I
 	auto somSearcher = _somAddon.getSearcher();
 
 	if (method == Database::SimilaritySettings::PreferredMethod::Features
-		|| (method == Database::SimilaritySettings::PreferredMethod::Auto && somSearcher))
+		|| (method == Database::SimilaritySettings::PreferredMethod::Auto
+			&& somSearcher
+			&& std::any_of(std::cbegin(trackIds), std::cend(trackIds), [&](Database::IdType trackId) { return somSearcher->isTrackClassified(trackId); } )))
 	{
 		return somSearcher->getSimilarTracks(trackIds, maxCount);
 	}
diff --git a/src/similarity/features/SimilarityFeaturesSearcher.cpp b/src/similarity/features/SimilarityFeaturesSearcher.cpp
index 02479a5a..67ef6486 100644
--- a/src/similarity/features/SimilarityFeaturesSearcher.cpp
+++ b/src/similarity/features/SimilarityFeaturesSearcher.cpp
@@ -221,6 +221,12 @@ FeaturesSearcher::isValid() const
 	return _network.get() != nullptr;
 }
 
+bool
+FeaturesSearcher::isTrackClassified(Database::IdType trackId) const
+{
+	return (_trackPositions.find(trackId) != _trackPositions.end());
+}
+
 bool
 FeaturesSearcher::isReleaseClassified(Database::IdType releaseId) const
 {
diff --git a/src/similarity/features/SimilarityFeaturesSearcher.hpp b/src/similarity/features/SimilarityFeaturesSearcher.hpp
index b311cf98..386f3496 100644
--- a/src/similarity/features/SimilarityFeaturesSearcher.hpp
+++ b/src/similarity/features/SimilarityFeaturesSearcher.hpp
@@ -43,8 +43,9 @@ class FeaturesSearcher
 
 		bool isValid() const;
 
+		bool isTrackClassified(Database::IdType trackId) const;
 		bool isReleaseClassified(Database::IdType releaseId) const;
-		bool isArtistClassified(Database::IdType releaseId) const;
+		bool isArtistClassified(Database::IdType artistId) const;
 
 		std::vector<Database::IdType> getSimilarTracks(const std::set<Database::IdType>& tracksId, std::size_t maxCount) const;
 		std::vector<Database::IdType> getSimilarReleases(Database::IdType releaseId, std::size_t maxCount) const;