diff --git a/lib/screens/local_album_screen.dart b/lib/screens/local_album_screen.dart
index 5fe1b77a..bffcb089 100644
--- a/lib/screens/local_album_screen.dart
+++ b/lib/screens/local_album_screen.dart
@@ -1751,18 +1751,18 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
 
               Row(
                 children: [
-                  Expanded(
-                    child: _LocalAlbumSelectionActionButton(
-                      icon: Icons.download_for_offline_outlined,
-                      label:
-                          '${context.l10n.queueFlacAction} ($flacEligibleCount)',
-                      onPressed: flacEligibleCount > 0
-                          ? () => _queueSelectedAsFlac(tracks)
-                          : null,
-                      colorScheme: colorScheme,
+                  if (flacEligibleCount > 0) ...[
+                    Expanded(
+                      child: _LocalAlbumSelectionActionButton(
+                        icon: Icons.download_for_offline_outlined,
+                        label:
+                            '${context.l10n.queueFlacAction} ($flacEligibleCount)',
+                        onPressed: () => _queueSelectedAsFlac(tracks),
+                        colorScheme: colorScheme,
+                      ),
                     ),
-                  ),
-                  const SizedBox(width: 8),
+                    const SizedBox(width: 8),
+                  ],
                   Expanded(
                     child: _LocalAlbumSelectionActionButton(
                       icon: Icons.auto_fix_high_outlined,
diff --git a/lib/screens/queue_tab.dart b/lib/screens/queue_tab.dart
index eb82c984..26ba7861 100644
--- a/lib/screens/queue_tab.dart
+++ b/lib/screens/queue_tab.dart
@@ -5472,15 +5472,13 @@ class _QueueTabState extends ConsumerState<QueueTab> {
               // Action buttons row: Share/Re-enrich, Convert, Delete
               Row(
                 children: [
-                  if (localOnlySelection) ...[
+                  if (localOnlySelection && flacEligibleCount > 0) ...[
                     Expanded(
                       child: _SelectionActionButton(
                         icon: Icons.download_for_offline_outlined,
                         label:
                             '${context.l10n.queueFlacAction} ($flacEligibleCount)',
-                        onPressed: flacEligibleCount > 0
-                            ? () => _queueSelectedLocalAsFlac(unifiedItems)
-                            : null,
+                        onPressed: () => _queueSelectedLocalAsFlac(unifiedItems),
                         colorScheme: colorScheme,
                       ),
                     ),