diff --git a/src/core/Song.cpp b/src/core/Song.cpp
index 06ac15633de..fef66f1932d 100644
--- a/src/core/Song.cpp
+++ b/src/core/Song.cpp
@@ -620,6 +620,7 @@ void Song::togglePause()
 	{
 		m_playing = false;
 		m_paused = true;
+		Engine::audioEngine()->clear();
 	}
 
 	m_vstSyncController.setPlaybackState( m_playing );
diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index 1dbbe1cf4c2..d4781eccd0a 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -858,8 +858,7 @@ void PianoRoll::setCurrentMidiClip( MidiClip* newMidiClip )
 	}
 
 	// force the song-editor to stop playing if it played a MIDI clip before
-	if( Engine::getSong()->isPlaying() &&
-		Engine::getSong()->playMode() == Song::Mode_PlayMidiClip )
+	if (Engine::getSong()->playMode() == Song::Mode_PlayMidiClip)
 	{
 		Engine::getSong()->playMidiClip( nullptr );
 	}