diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index d1cc516bd..06dbd150a 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -898,6 +898,7 @@ void HU_TickSongCredits(void)
 		cursongcredit.x = cursongcredit.old_x = 0;
 		cursongcredit.anim = 0;
 		cursongcredit.trans = NUMTRANSMAPS;
+		cursongcredit.use_credits_offset = false;
 		return;
 	}
 
@@ -1987,6 +1988,10 @@ void HU_DrawSongCredits(void)
 	{
 		y = (BASEVIDHEIGHT - 13) * FRACUNIT;
 	}
+	else if (cursongcredit.use_credits_offset)
+	{
+		y = (BASEVIDHEIGHT - 13) * FRACUNIT;
+	}
 	else if (gamestate == GS_MENU)
 	{
 		y = 30 * FRACUNIT;
diff --git a/src/s_sound.c b/src/s_sound.c
index 2f5218f85..221a84479 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -2452,6 +2452,7 @@ void S_ShowMusicCredit(void)
 	cursongcredit.anim = 5*TICRATE;
 	cursongcredit.x = cursongcredit.old_x = 0;
 	cursongcredit.trans = NUMTRANSMAPS;
+	cursongcredit.use_credits_offset = (gamestate == GS_CREDITS || (demo.playback && demo.attract == DEMO_ATTRACT_CREDITS));
 }
 
 void S_StopMusicCredit(void)
diff --git a/src/s_sound.h b/src/s_sound.h
index af437cadc..23afc95ab 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -208,6 +208,7 @@ extern struct cursongcredit
 	UINT8 trans;
 	fixed_t x;
 	fixed_t old_x;
+	boolean use_credits_offset;
 } cursongcredit;
 
 // For menu, always appears