diff --git a/core/lyrics/lyrics_suite_test.go b/core/lyrics/lyrics_suite_test.go
index e7230ab6e..c9fdcbae8 100644
--- a/core/lyrics/lyrics_suite_test.go
+++ b/core/lyrics/lyrics_suite_test.go
@@ -20,8 +20,9 @@ func TestLyrics(t *testing.T) {
 	RunSpecs(t, "Lyrics Suite")
 }
 
-// Register a no-op extractor so that storage.For("file://...") works in tests.
-// The lyrics package only needs FS() for sidecar reads; ReadTags is never called.
+// core/storage/local calls log.Fatal if the default scanner extractor is unregistered
+// when constructing any localStorage. Register a no-op so storage.For("file://...") works
+// in tests without importing the real extractor.
 var _ = BeforeSuite(func() {
 	local.RegisterExtractor(consts.DefaultScannerExtractor, func(fs.FS, string) local.Extractor {
 		return &noopExtractor{}
diff --git a/core/lyrics/sources.go b/core/lyrics/sources.go
index d19b0e92d..3476230a5 100644
--- a/core/lyrics/sources.go
+++ b/core/lyrics/sources.go
@@ -9,7 +9,6 @@ import (
 	"path"
 
 	"github.com/navidrome/navidrome/core/storage"
-	_ "github.com/navidrome/navidrome/core/storage/local"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/utils/ioutils"
diff --git a/core/lyrics/sources_test.go b/core/lyrics/sources_test.go
index 1f2249478..06dcb2602 100644
--- a/core/lyrics/sources_test.go
+++ b/core/lyrics/sources_test.go
@@ -74,7 +74,7 @@ var _ = Describe("sources", func() {
 			Expect(lyrics).To(HaveLen(0))
 		})
 
-		// fromExternalFile delegates format parsing to model.ParseLyrics; the
+		// fromExternalFile delegates format parsing to model.ParseLyricsFile; the
 		// per-format parser output is covered exhaustively in the model package.
 		// Here we only verify each suffix is read from the library FS and routed.
 		DescribeTable("should read the sidecar file and route its suffix to a parser",