diff --git a/src/export/Export.cpp b/src/export/Export.cpp
index 77e8b9c40..a1d42f59b 100644
--- a/src/export/Export.cpp
+++ b/src/export/Export.cpp
@@ -1360,9 +1360,11 @@ ExportMixerDialog::ExportMixerDialog( const TrackList *tracks, bool selectedOnly
 
    unsigned numTracks = 0;
 
+   bool anySolo = !(( tracks->Any<const WaveTrack>() + &WaveTrack::GetSolo ).empty());
+
    for (auto t :
          tracks->Any< const WaveTrack >()
-            + ( selectedOnly ? &Track::IsSelected : &Track::Any )
+            + (anySolo ? &WaveTrack::GetSolo : ( selectedOnly ? &Track::IsSelected : &Track::Any ) )
             - &WaveTrack::GetMute
    ) {
       numTracks++;