diff --git a/Plugins/vgmstream/vgmstream/VGMContainer.m b/Plugins/vgmstream/vgmstream/VGMContainer.m
index da85f55e6..52b0f3b19 100644
--- a/Plugins/vgmstream/vgmstream/VGMContainer.m
+++ b/Plugins/vgmstream/vgmstream/VGMContainer.m
@@ -53,6 +53,11 @@
 		return @[];
 	}
 
+	if(stream->stream_index > 0) {
+		close_vgmstream(stream);
+		return @[];
+	}
+
 	VGMInfoCache *sharedMyCache = [VGMInfoCache sharedCache];
 
 	NSMutableArray *tracks = [NSMutableArray array];
diff --git a/Plugins/vgmstream/vgmstream/VGMInterface.m b/Plugins/vgmstream/vgmstream/VGMInterface.m
index c24562a76..a9452a8c7 100644
--- a/Plugins/vgmstream/vgmstream/VGMInterface.m
+++ b/Plugins/vgmstream/vgmstream/VGMInterface.m
@@ -336,9 +336,6 @@ VGMSTREAM* init_vgmstream_from_cogfile(const char* path, int subsong) {
 	STREAMFILE* sf;
 	VGMSTREAM* vgm = NULL;
 
-	if(!subsong)
-		subsong = 1;
-
 	sf = open_cog_streamfile(path);
 
 	if(sf) {