diff --git a/Storage/Disk/Encodings/MFM.cpp b/Storage/Disk/Encodings/MFM.cpp
index e8cf95179..c0086c071 100644
--- a/Storage/Disk/Encodings/MFM.cpp
+++ b/Storage/Disk/Encodings/MFM.cpp
@@ -406,7 +406,8 @@ std::shared_ptr<Storage::Encodings::MFM::Sector> Parser::get_next_sector()
 
 std::shared_ptr<Storage::Encodings::MFM::Sector> Parser::get_sector(uint8_t sector)
 {
-	std::shared_ptr<Storage::Encodings::MFM::Sector> first_sector = get_next_sector();
+	std::shared_ptr<Storage::Encodings::MFM::Sector> first_sector;
+	while(!first_sector && index_count_ < 2) first_sector = get_next_sector();
 	if(!first_sector) return first_sector;
 	if(first_sector->sector == sector) return first_sector;