diff --git a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp
index a752a5d1b..aad9fdbdf 100644
--- a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp
+++ b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp
@@ -87,6 +87,7 @@ LastFmPlugin::~LastFmPlugin()
 {
     qDebug() << Q_FUNC_INFO;
     delete m_scrobbler;
+    m_scrobbler = 0;
 }
 
 
@@ -753,7 +754,10 @@ LastFmPlugin::settingsChanged()
         m_pw = TomahawkSettings::instance()->lastFmPassword();
         // credentials have changed, have to re-create scrobbler for them to take effect
         if( m_scrobbler )
+        {
             delete m_scrobbler;
+            m_scrobbler = 0;
+        }
 
         createScrobbler();
     }