diff --git a/src/libtomahawk/database/DatabaseImpl.cpp b/src/libtomahawk/database/DatabaseImpl.cpp
index 60c34f9ae..6ad747104 100644
--- a/src/libtomahawk/database/DatabaseImpl.cpp
+++ b/src/libtomahawk/database/DatabaseImpl.cpp
@@ -74,7 +74,7 @@ DatabaseImpl::DatabaseImpl( const QString& dbname, Database* parent )
     // in case of unclean shutdown last time:
     query.exec( "UPDATE source SET isonline = 'false'" );
 
-    m_fuzzyIndex = new FuzzyIndex( schemaUpdated );
+    m_fuzzyIndex = new FuzzyIndex( this, schemaUpdated );
     if ( schemaUpdated )
         QTimer::singleShot( 0, this, SLOT( updateIndex() ) );
 
@@ -113,8 +113,6 @@ DatabaseImpl::init()
 
 DatabaseImpl::~DatabaseImpl()
 {
-    delete m_fuzzyIndex;
-    
     tDebug() << "Shutting down database.";
 
 /*
diff --git a/src/libtomahawk/database/FuzzyIndex.cpp b/src/libtomahawk/database/FuzzyIndex.cpp
index 86334d5a0..a6a117ffc 100644
--- a/src/libtomahawk/database/FuzzyIndex.cpp
+++ b/src/libtomahawk/database/FuzzyIndex.cpp
@@ -38,8 +38,8 @@ using namespace lucene::queryParser;
 using namespace lucene::search;
 
 
-FuzzyIndex::FuzzyIndex( bool wipeIndex )
-    : QObject()
+FuzzyIndex::FuzzyIndex( QObject* parent, bool wipeIndex )
+    : QObject( parent )
     , m_luceneReader( 0 )
     , m_luceneSearcher( 0 )
 {
diff --git a/src/libtomahawk/database/FuzzyIndex.h b/src/libtomahawk/database/FuzzyIndex.h
index 8a66b491b..f6da1aa76 100644
--- a/src/libtomahawk/database/FuzzyIndex.h
+++ b/src/libtomahawk/database/FuzzyIndex.h
@@ -55,7 +55,7 @@ class FuzzyIndex : public QObject
 Q_OBJECT
 
 public:
-    explicit FuzzyIndex( bool wipeIndex = false );
+    explicit FuzzyIndex( QObject* parent, bool wipeIndex = false );
     ~FuzzyIndex();
 
     void beginIndexing();