diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp
index 1cfc2d49d..8c574483d 100644
--- a/aegisub/src/video_provider_ffmpegsource.cpp
+++ b/aegisub/src/video_provider_ffmpegsource.cpp
@@ -127,7 +127,9 @@ void FFmpegSourceVideoProvider::LoadVideo(wxString filename) {
 	
 	// moment of truth
 	if (!Index) {
-		int TrackMask = OPT_GET("Provider/FFmpegSource/Index All Tracks")->GetBool() ? FFMS_TRACKMASK_ALL : FFMS_TRACKMASK_NONE;
+		int TrackMask = FFMS_TRACKMASK_NONE;
+		if (OPT_GET("Provider/FFmpegSource/Index All Tracks")->GetBool() || OPT_GET("Video/Open Audio")->GetBool())
+			TrackMask = FFMS_TRACKMASK_ALL;
 		// ignore audio decoding errors here, we don't care right now
 		Index = DoIndexing(Indexer, CacheName, TrackMask, FFMS_IEH_IGNORE);
 	}