diff --git a/src/accounts/spotify/SpotifyAccount.cpp b/src/accounts/spotify/SpotifyAccount.cpp
index 16b9e22a0..5f4add6ec 100644
--- a/src/accounts/spotify/SpotifyAccount.cpp
+++ b/src/accounts/spotify/SpotifyAccount.cpp
@@ -88,6 +88,12 @@ SpotifyAccount::SpotifyAccount( const QString& accountId )
 SpotifyAccount::~SpotifyAccount()
 {
     clearUser();
+
+    if ( m_spotifyResolver.isNull() )
+        return;
+
+    Pipeline::instance()->removeScriptResolver( m_spotifyResolver.data()->filePath() );
+    delete m_spotifyResolver.data();
 }