diff --git a/quakespasm/Quake/cl_parse.c b/quakespasm/Quake/cl_parse.c
index 89501cac..79418d52 100644
--- a/quakespasm/Quake/cl_parse.c
+++ b/quakespasm/Quake/cl_parse.c
@@ -261,6 +261,12 @@ void CL_ParseServerInfo (void)
 	char	sound_precache[MAX_SOUNDS][MAX_QPATH];
 
 	Con_DPrintf ("Serverinfo packet received.\n");
+
+// ericw -- bring up loading plaque for map changes within a demo.
+//          it will be hidden in CL_SignonReply.
+	if (cls.demoplayback)
+		SCR_BeginLoadingPlaque();
+
 //
 // wipe the client_state_t struct
 //
diff --git a/quakespasm/Quake/host_cmd.c b/quakespasm/Quake/host_cmd.c
index 36e2d535..a0f4f2f6 100644
--- a/quakespasm/Quake/host_cmd.c
+++ b/quakespasm/Quake/host_cmd.c
@@ -972,6 +972,9 @@ This is sent just before a server changes levels
 */
 void Host_Reconnect_f (void)
 {
+	if (cls.demoplayback)	// cross-map demo playback fix from Baker
+		return;
+
 	SCR_BeginLoadingPlaque ();
 	cls.signon = 0;		// need new connection messages
 }