diff --git a/src/music/libtimidity.cpp b/src/music/libtimidity.cpp
index 2c2795a188..3c2c419e09 100644
--- a/src/music/libtimidity.cpp
+++ b/src/music/libtimidity.cpp
@@ -82,11 +82,12 @@ const char *MusicDriver_LibTimidity::Start(const StringList &param)
 
 void MusicDriver_LibTimidity::Stop()
 {
+	this->StopSong();
+
 	MxSetMusicSource(nullptr);
 
 	std::lock_guard<std::mutex> lock{ _midi.synth_mutex };
 
-	if (_midi.status == MIDI_PLAYING) this->StopSong();
 	mid_exit();
 }