diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8f284915d..5d29f8d42 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D2X-Rebirth Changelog
 20110708
 --------
 main/net_udp.c: Slight improvement for Packet Loss Prevention: Be able to send to 35 packets per call of net_udp_noloss_process_queue() and also let counter only increase if a packet was actually sent, making sure the queue is not stuck on the first 5 packets in the list
+arch/sdl/digi.c: Make sure hmp_reset() is only executed if a song was playing
 
 20110704
 --------
diff --git a/arch/sdl/digi.c b/arch/sdl/digi.c
index c64215e87..e767f1ef9 100644
--- a/arch/sdl/digi.c
+++ b/arch/sdl/digi.c
@@ -185,12 +185,11 @@ void digi_win32_resume_midi_song()
 
 void digi_win32_stop_current_song()
 {
-	if (digi_win32_midi_song_playing)
-	{
-		hmp_close(cur_hmp);
-		cur_hmp = NULL;
-		digi_win32_midi_song_playing = 0;
-	}
+	if (!digi_win32_midi_song_playing)
+		return;
+	hmp_close(cur_hmp);
+	cur_hmp = NULL;
+	digi_win32_midi_song_playing = 0;
 	hmp_reset();
 }
 #endif