diff --git a/src/libtomahawk/source.cpp b/src/libtomahawk/source.cpp
index d5a401106..d6a6a090f 100644
--- a/src/libtomahawk/source.cpp
+++ b/src/libtomahawk/source.cpp
@@ -41,8 +41,8 @@ Source::~Source()
 {
     qDebug() << Q_FUNC_INFO << friendlyName();
 
-    DatabaseCommand_SourceOffline* cmd = new DatabaseCommand_SourceOffline( id() );
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
+/*    DatabaseCommand_SourceOffline* cmd = new DatabaseCommand_SourceOffline( id() );
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );*/
 }
 
 
@@ -85,7 +85,6 @@ Source::remove()
     emit offline();
     m_collections.clear();
     SourceList::instance()->remove( this );
-    deleteLater();
 }
 
 
diff --git a/src/libtomahawk/sourcelist.cpp b/src/libtomahawk/sourcelist.cpp
index 3fac54e0e..f6e46c1b0 100644
--- a/src/libtomahawk/sourcelist.cpp
+++ b/src/libtomahawk/sourcelist.cpp
@@ -67,7 +67,6 @@ SourceList::remove( Tomahawk::source_ptr& s )
         return;
 
     remove( s.data() );
-    s.clear();
 }
 
 
@@ -91,6 +90,7 @@ SourceList::remove( Tomahawk::Source* s )
     }
 
     emit sourceRemoved( src );
+    src.clear();
 }
 
 void