diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index e07731e..2c66a0d 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -351,6 +351,12 @@ void SV_SpawnServer( char *server, qboolean killBots ) {
 	char		systemInfo[16384];
 	const char	*p;
 
+	// stop any active demo recording (one demo = one map)
+	if ( SVD_IsRecording() ) {
+		Com_Printf( "Map change — stopping demo recording.\n" );
+		SVD_StopRecord_f();
+	}
+
 	// shut down the existing game if it is running
 	SV_ShutdownGameProgs();