diff --git a/src/libtomahawk/database/DatabaseImpl.cpp b/src/libtomahawk/database/DatabaseImpl.cpp
index 2f21fa90a..bd8c8dd5a 100644
--- a/src/libtomahawk/database/DatabaseImpl.cpp
+++ b/src/libtomahawk/database/DatabaseImpl.cpp
@@ -126,6 +126,22 @@ DatabaseImpl::~DatabaseImpl()
 }
 
 
+TomahawkSqlQuery
+DatabaseImpl::newquery()
+{
+    QMutexLocker lock( &m_mutex );
+    return TomahawkSqlQuery( m_db );
+}
+
+
+QSqlDatabase&
+DatabaseImpl::database()
+{
+    QMutexLocker lock( &m_mutex );
+    return m_db;
+}
+
+
 DatabaseImpl*
 DatabaseImpl::clone() const
 {
diff --git a/src/libtomahawk/database/DatabaseImpl.h b/src/libtomahawk/database/DatabaseImpl.h
index ddbe8309a..c5fa87688 100644
--- a/src/libtomahawk/database/DatabaseImpl.h
+++ b/src/libtomahawk/database/DatabaseImpl.h
@@ -50,8 +50,8 @@ public:
 
     DatabaseImpl* clone() const;
 
-    TomahawkSqlQuery newquery() { return TomahawkSqlQuery( m_db ); }
-    QSqlDatabase& database() { return m_db; }
+    TomahawkSqlQuery newquery();
+    QSqlDatabase& database();
 
     int artistId( const QString& name_orig, bool autoCreate ); //also for composers!
     int trackId( int artistid, const QString& name_orig, bool autoCreate );