diff --git a/support/megacd/megacd.h b/support/megacd/megacd.h
index d5f207c..a0130b5 100644
--- a/support/megacd/megacd.h
+++ b/support/megacd/megacd.h
@@ -66,6 +66,7 @@ private:
 	int audioOffset;
 	int chd_hunknum;
 	uint8_t *chd_hunkbuf;
+	int chd_audio_read_lba;
 	uint8_t stat[10];
 	uint8_t comm[10];
 
diff --git a/support/megacd/megacdd.cpp b/support/megacd/megacdd.cpp
index fba97c9..37ec919 100644
--- a/support/megacd/megacdd.cpp
+++ b/support/megacd/megacdd.cpp
@@ -348,6 +348,7 @@ void cdd_t::Reset() {
 	status = CD_STAT_STOP;
 	audioLength = 0;
 	audioOffset = 0;
+	chd_audio_read_lba = 0;
 
 	stat[0] = 0x0;
 	stat[1] = 0x0;
@@ -416,11 +417,11 @@ void cdd_t::Update() {
 			{
 				this->isData = 0x00;
 			}
-
 			SectorSend(0);
 		}
 
-		//this->lba++;
+		this->lba++;
+		this->chd_audio_read_lba++;
 
 		if (this->lba >= this->toc.tracks[this->index].end)
 		{
@@ -677,6 +678,7 @@ void cdd_t::CommandExec() {
 			FileSeek(&this->toc.tracks[index].f, (lba_ * 2352) - this->toc.tracks[index].offset, SEEK_SET);
 		}
 
+		this->chd_audio_read_lba = this->lba;
 		this->audioOffset = 0;
 
 		//if (this->toc.sub) fseek(this->toc.sub, lba_ * 96, SEEK_SET);
@@ -762,7 +764,6 @@ void cdd_t::CommandExec() {
 		this->status = CD_STAT_PLAY;
 		stat[0] = this->status;
 		this->audioOffset = 0;
-
 		//printf("\x1b[32mMCD: Command RESUME, status = %X\n\x1b[0m", this->status);
 		break;
 
@@ -879,7 +880,6 @@ void cdd_t::ReadData(uint8_t *buf)
 			FileReadAdv(&this->toc.tracks[0].f, buf, 2048);
 		}
 	}
-	this->lba++;
 }
 
 int cdd_t::ReadCDDA(uint8_t *buf)
@@ -892,7 +892,6 @@ int cdd_t::ReadCDDA(uint8_t *buf)
 
 	if (this->isData)
 	{
-		//????
 		return this->audioLength;
 	}
 
@@ -900,7 +899,7 @@ int cdd_t::ReadCDDA(uint8_t *buf)
 	{
 		for(int i = 0; i < this->audioLength / 2352; i++)
 		{
-			mister_chd_read_sector(this->toc.chd_f, this->lba + this->toc.tracks[this->index].offset, 2352*i, 0, 2352, buf, this->chd_hunkbuf, &this->chd_hunknum);
+			mister_chd_read_sector(this->toc.chd_f, this->chd_audio_read_lba + this->toc.tracks[this->index].offset, 2352*i, 0, 2352, buf, this->chd_hunkbuf, &this->chd_hunknum);
 		}
 
 		//CHD audio requires byteswap. There's probably a better way to do this...
@@ -912,11 +911,15 @@ int cdd_t::ReadCDDA(uint8_t *buf)
 			buf[swapidx+1] = temp;
 		}
 
+		if ((this->audioLength / 2352) > 1)
+		{
+			this->chd_audio_read_lba++;
+		}
+
 	} else if (this->toc.tracks[this->index].f.opened()) {
 		FileReadAdv(&this->toc.tracks[this->index].f, buf, this->audioLength);
 	}
 
-	this->lba += (this->audioLength / 2352);
 	return this->audioLength;
 }