diff --git a/lib/common/data/audio.dart b/lib/common/data/audio.dart
index 6183e4e2b..395ce5ab1 100644
--- a/lib/common/data/audio.dart
+++ b/lib/common/data/audio.dart
@@ -296,6 +296,7 @@ class Audio {
       artist: data.artist,
       title: (data.title?.isNotEmpty == true ? data.title : fileName) ?? path,
       album: data.album,
+      // TODO(#339): wait for https://github.com/ClementBeal/audio_metadata_reader/issues/13
       albumArtist: data.artist,
       discNumber: data.discNumber,
       discTotal: data.totalDisc,
diff --git a/lib/local_audio/local_audio_view.dart b/lib/local_audio/local_audio_view.dart
index 37b03c0a7..0688dc2fd 100644
--- a/lib/local_audio/local_audio_view.dart
+++ b/lib/local_audio/local_audio_view.dart
@@ -3,7 +3,7 @@ import '../l10n/l10n.dart';
 enum LocalAudioView {
   titles,
   artists,
-  albumArtists,
+  // albumArtists,
   albums,
   genres,
   playlists;
@@ -11,7 +11,7 @@ enum LocalAudioView {
   String localize(AppLocalizations l10n) => switch (this) {
         titles => l10n.titles,
         artists => l10n.artists,
-        albumArtists => l10n.albumArtists,
+        // albumArtists => l10n.albumArtists,
         albums => l10n.albums,
         genres => l10n.genres,
         playlists => l10n.playlists,
diff --git a/lib/local_audio/view/local_audio_body.dart b/lib/local_audio/view/local_audio_body.dart
index 787762d9b..eab1b9713 100644
--- a/lib/local_audio/view/local_audio_body.dart
+++ b/lib/local_audio/view/local_audio_body.dart
@@ -43,11 +43,11 @@ class LocalAudioBody extends StatelessWidget {
             noResultMessage: noResultMessage,
             noResultIcon: noResultIcon,
           ),
-        LocalAudioView.albumArtists => AlbumArtistsView(
-            albumArtists: albumArtists,
-            noResultMessage: noResultMessage,
-            noResultIcon: noResultIcon,
-          ),
+        // LocalAudioView.albumArtists => AlbumArtistsView(
+        //     albumArtists: albumArtists,
+        //     noResultMessage: noResultMessage,
+        //     noResultIcon: noResultIcon,
+        //   ),
         LocalAudioView.albums => AlbumsView(
             albums: albums,
             noResultMessage: noResultMessage,
diff --git a/lib/search/search_model.dart b/lib/search/search_model.dart
index 5ddc4a539..4c4ba000b 100644
--- a/lib/search/search_model.dart
+++ b/lib/search/search_model.dart
@@ -313,9 +313,11 @@ class SearchModel extends SafeChangeNotifier {
               setSearchType(SearchType.localAlbum);
             } else if (localSearchResult?.artists?.isNotEmpty == true) {
               setSearchType(SearchType.localArtist);
-            } else if (localSearchResult?.albumArtists?.isNotEmpty == true) {
-              setSearchType(SearchType.localAlbumArtist);
-            } else if (localSearchResult?.genres?.isNotEmpty == true) {
+            }
+            // else if (localSearchResult?.albumArtists?.isNotEmpty == true) {
+            //   setSearchType(SearchType.localAlbumArtist);
+            // }
+            else if (localSearchResult?.genres?.isNotEmpty == true) {
               setSearchType(SearchType.localGenreName);
             } else if (localSearchResult?.playlists?.isNotEmpty == true) {
               setSearchType(SearchType.localPlaylists);
diff --git a/lib/search/search_type.dart b/lib/search/search_type.dart
index 2b2d5c1bf..72e28f910 100644
--- a/lib/search/search_type.dart
+++ b/lib/search/search_type.dart
@@ -4,7 +4,7 @@ import '../l10n/l10n.dart';
 enum SearchType {
   localTitle,
   localArtist,
-  localAlbumArtist,
+  // localAlbumArtist,
   localAlbum,
   localGenreName,
   localPlaylists,
@@ -17,7 +17,7 @@ enum SearchType {
   String localize(AppLocalizations l10n) => switch (this) {
         localTitle => l10n.titles,
         localArtist => l10n.artists,
-        localAlbumArtist => l10n.albumArtists,
+        // localAlbumArtist => l10n.albumArtists,
         localAlbum => l10n.albums,
         localGenreName => l10n.genres,
         localPlaylists => l10n.playlists,
diff --git a/lib/search/view/sliver_local_search_results.dart b/lib/search/view/sliver_local_search_results.dart
index 39a629997..2cdc1ca26 100644
--- a/lib/search/view/sliver_local_search_results.dart
+++ b/lib/search/view/sliver_local_search_results.dart
@@ -42,7 +42,7 @@ class _SliverLocalSearchResultState extends State<SliverLocalSearchResult> {
       (SearchModel m) => switch (m.searchType) {
         SearchType.localAlbum => LocalAudioView.albums,
         SearchType.localArtist => LocalAudioView.artists,
-        SearchType.localAlbumArtist => LocalAudioView.albumArtists,
+        // SearchType.localAlbumArtist => LocalAudioView.albumArtists,
         SearchType.localTitle => LocalAudioView.titles,
         SearchType.localGenreName => LocalAudioView.genres,
         _ => LocalAudioView.playlists,
diff --git a/lib/search/view/sliver_search_type_filter_bar.dart b/lib/search/view/sliver_search_type_filter_bar.dart
index 9e358247b..f010d66d2 100644
--- a/lib/search/view/sliver_search_type_filter_bar.dart
+++ b/lib/search/view/sliver_search_type_filter_bar.dart
@@ -62,8 +62,8 @@ class SearchTypeFilterBar extends StatelessWidget with WatchItMixin {
             ' (${localSearchResult?.albums?.length ?? '0'})',
           SearchType.localArtist =>
             ' (${localSearchResult?.artists?.length ?? '0'})',
-          SearchType.localAlbumArtist =>
-            ' (${localSearchResult?.albumArtists?.length ?? '0'})',
+          // SearchType.localAlbumArtist =>
+          //   ' (${localSearchResult?.albumArtists?.length ?? '0'})',
           SearchType.localGenreName =>
             ' (${localSearchResult?.genres?.length ?? '0'})',
           SearchType.localPlaylists =>