diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioInVideo.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioInVideo.cs
index 2baa633399..ac2542beb0 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckAudioInVideo.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioInVideo.cs
@@ -6,6 +6,8 @@ using System.IO;
 using osu.Game.IO.FileAbstraction;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Storyboards;
+using TagLib;
+using File = TagLib.File;
 
 namespace osu.Game.Rulesets.Edit.Checks
 {
@@ -50,31 +52,30 @@ namespace osu.Game.Rulesets.Edit.Checks
                     continue;
                 }
 
-                using Stream data = context.WorkingBeatmap.GetStream(storagePath);
-                var fileAbstraction = new StreamFileAbstraction(filename, data);
-
-                // We use TagLib here for platform invariance; BASS cannot detect audio presence on Linux.
-                TagLib.File tagFile = null;
-                string errorReason = null;
+                Issue issue;
 
                 try
                 {
-                    tagFile = TagLib.File.Create(fileAbstraction);
-                }
-                catch (TagLib.CorruptFileException) { errorReason = "Corrupt file"; }
-                catch (TagLib.UnsupportedFormatException) { errorReason = "Unsupported format"; }
+                    // We use TagLib here for platform invariance; BASS cannot detect audio presence on Linux.
+                    using (Stream data = context.WorkingBeatmap.GetStream(storagePath))
+                    using (File tagFile = File.Create(new StreamFileAbstraction(filename, data)))
+                    {
+                        if (tagFile.Properties.AudioChannels == 0)
+                            continue;
+                    }
 
-                if (errorReason != null)
+                    issue = new IssueTemplateHasAudioTrack(this).Create(filename);
+                }
+                catch (CorruptFileException)
                 {
-                    yield return new IssueTemplateFileError(this).Create(filename, errorReason);
-
-                    continue;
+                    issue = new IssueTemplateFileError(this).Create(filename, "Corrupt file");
+                }
+                catch (UnsupportedFormatException)
+                {
+                    issue = new IssueTemplateFileError(this).Create(filename, "Unsupported format");
                 }
 
-                if (tagFile.Properties.AudioChannels == 0)
-                    continue;
-
-                yield return new IssueTemplateHasAudioTrack(this).Create(filename);
+                yield return issue;
             }
         }
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckTooShortAudioFiles.cs b/osu.Game/Rulesets/Edit/Checks/CheckTooShortAudioFiles.cs
index c3faf6edc1..57f7c60916 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckTooShortAudioFiles.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckTooShortAudioFiles.cs
@@ -31,29 +31,31 @@ namespace osu.Game.Rulesets.Edit.Checks
 
             foreach (var file in beatmapSet.Files)
             {
-                using Stream data = context.WorkingBeatmap.GetStream(file.FileInfo.StoragePath);
-                if (data == null)
-                    continue;
-
-                var fileCallbacks = new FileCallbacks(new DataStreamFileProcedures(data));
-                int decodeStream = Bass.CreateStream(StreamSystem.NoBuffer, BassFlags.Decode | BassFlags.Prescan, fileCallbacks.Callbacks, fileCallbacks.Handle);
-
-                if (decodeStream == 0)
+                using (Stream data = context.WorkingBeatmap.GetStream(file.FileInfo.StoragePath))
                 {
-                    // If the file is not likely to be properly parsed by Bass, we don't produce Error issues about it.
-                    // Image files and audio files devoid of audio data both fail, for example, but neither would be issues in this check.
-                    if (hasAudioExtension(file.Filename) && probablyHasAudioData(data))
-                        yield return new IssueTemplateBadFormat(this).Create(file.Filename);
+                    if (data == null)
+                        continue;
 
-                    continue;
+                    var fileCallbacks = new FileCallbacks(new DataStreamFileProcedures(data));
+                    int decodeStream = Bass.CreateStream(StreamSystem.NoBuffer, BassFlags.Decode | BassFlags.Prescan, fileCallbacks.Callbacks, fileCallbacks.Handle);
+
+                    if (decodeStream == 0)
+                    {
+                        // If the file is not likely to be properly parsed by Bass, we don't produce Error issues about it.
+                        // Image files and audio files devoid of audio data both fail, for example, but neither would be issues in this check.
+                        if (hasAudioExtension(file.Filename) && probablyHasAudioData(data))
+                            yield return new IssueTemplateBadFormat(this).Create(file.Filename);
+
+                        continue;
+                    }
+
+                    long length = Bass.ChannelGetLength(decodeStream);
+                    double ms = Bass.ChannelBytes2Seconds(decodeStream, length) * 1000;
+
+                    // Extremely short audio files do not play on some soundcards, resulting in nothing being heard in-game for some users.
+                    if (ms > 0 && ms < ms_threshold)
+                        yield return new IssueTemplateTooShort(this).Create(file.Filename, ms);
                 }
-
-                long length = Bass.ChannelGetLength(decodeStream);
-                double ms = Bass.ChannelBytes2Seconds(decodeStream, length) * 1000;
-
-                // Extremely short audio files do not play on some soundcards, resulting in nothing being heard in-game for some users.
-                if (ms > 0 && ms < ms_threshold)
-                    yield return new IssueTemplateTooShort(this).Create(file.Filename, ms);
             }
         }
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckZeroByteFiles.cs b/osu.Game/Rulesets/Edit/Checks/CheckZeroByteFiles.cs
index 406ec013d7..3a994fabfa 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckZeroByteFiles.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckZeroByteFiles.cs
@@ -22,9 +22,11 @@ namespace osu.Game.Rulesets.Edit.Checks
 
             foreach (var file in beatmapSet.Files)
             {
-                using Stream data = context.WorkingBeatmap.GetStream(file.FileInfo.StoragePath);
-                if (data?.Length == 0)
-                    yield return new IssueTemplateZeroBytes(this).Create(file.Filename);
+                using (Stream data = context.WorkingBeatmap.GetStream(file.FileInfo.StoragePath))
+                {
+                    if (data?.Length == 0)
+                        yield return new IssueTemplateZeroBytes(this).Create(file.Filename);
+                }
             }
         }