diff --git a/src/libtomahawk/database/Database.cpp b/src/libtomahawk/database/Database.cpp
index c6ea3938f..5dcb65430 100644
--- a/src/libtomahawk/database/Database.cpp
+++ b/src/libtomahawk/database/Database.cpp
@@ -41,7 +41,7 @@ Database::instance()
 Database::Database( const QString& dbname, QObject* parent )
     : QObject( parent )
     , m_ready( false )
-    , m_impl( new DatabaseImpl( dbname, this ) )
+    , m_impl( new DatabaseImpl( dbname ) )
     , m_workerRW( new DatabaseWorker( this, true ) )
 {
     s_instance = this;
diff --git a/src/libtomahawk/database/DatabaseImpl.cpp b/src/libtomahawk/database/DatabaseImpl.cpp
index 67bc8b298..763101363 100644
--- a/src/libtomahawk/database/DatabaseImpl.cpp
+++ b/src/libtomahawk/database/DatabaseImpl.cpp
@@ -43,9 +43,8 @@
 #define CURRENT_SCHEMA_VERSION 28
 
 
-DatabaseImpl::DatabaseImpl( const QString& dbname, Database* parent )
-    : QObject( (QObject*) parent )
-    , m_parent( parent )
+DatabaseImpl::DatabaseImpl( const QString& dbname )
+    : QObject( (QObject*) QThread::currentThread() )
 {
     QTime t;
     t.start();
@@ -86,10 +85,10 @@ DatabaseImpl::DatabaseImpl( const QString& dbname, Database* parent )
 }
 
 
-DatabaseImpl::DatabaseImpl( Database* parent, const QString& dbname )
+DatabaseImpl::DatabaseImpl( const QString& dbname, bool internal )
     : QObject( (QObject*) QThread::currentThread() )
-    , m_parent( parent )
 {
+    Q_UNUSED( internal );
     openDatabase( dbname, false );
     init();
 }
@@ -132,7 +131,7 @@ DatabaseImpl::clone() const
 {
     QMutexLocker lock( &m_mutex );
 
-    DatabaseImpl* impl = new DatabaseImpl( m_parent, m_db.databaseName() );
+    DatabaseImpl* impl = new DatabaseImpl( m_db.databaseName(), true );
     impl->setDatabaseID( m_dbid );
     impl->setFuzzyIndex( m_fuzzyIndex );
     return impl;
diff --git a/src/libtomahawk/database/DatabaseImpl.h b/src/libtomahawk/database/DatabaseImpl.h
index 47b921d33..ddbe8309a 100644
--- a/src/libtomahawk/database/DatabaseImpl.h
+++ b/src/libtomahawk/database/DatabaseImpl.h
@@ -45,7 +45,7 @@ friend class FuzzyIndex;
 friend class DatabaseCommand_UpdateSearchIndex;
 
 public:
-    DatabaseImpl( const QString& dbname, Database* parent = 0 );
+    DatabaseImpl( const QString& dbname );
     ~DatabaseImpl();
 
     DatabaseImpl* clone() const;
@@ -82,7 +82,7 @@ signals:
     void indexReady();
 
 private:
-    DatabaseImpl( Database* parent, const QString& dbname );
+    DatabaseImpl( const QString& dbname, bool internal );
     void setFuzzyIndex( FuzzyIndex* fi ) { m_fuzzyIndex = fi; }
     void setDatabaseID( const QString& dbid ) { m_dbid = dbid; }
 
@@ -92,7 +92,6 @@ private:
     void dumpDatabase();
     QString cleanSql( const QString& sql );
 
-    Database* m_parent;
     bool m_ready;
     QSqlDatabase m_db;