diff --git a/src/libtomahawk/database/TomahawkSqlQuery.cpp b/src/libtomahawk/database/TomahawkSqlQuery.cpp
index aa75fc9e5..ff4364673 100644
--- a/src/libtomahawk/database/TomahawkSqlQuery.cpp
+++ b/src/libtomahawk/database/TomahawkSqlQuery.cpp
@@ -45,9 +45,9 @@ TomahawkSqlQuery::TomahawkSqlQuery( const QSqlDatabase& db )
 
 
 QString
-TomahawkSqlQuery::escape( const QString& identifier, QSqlDriver::IdentifierType type )
+TomahawkSqlQuery::escape( QString identifier )
 {
-    return Database::instance()->impl()->database().driver()->escapeIdentifier( identifier, type );
+    return identifier.replace( "'", "''" );
 }
 
 
diff --git a/src/libtomahawk/database/TomahawkSqlQuery.h b/src/libtomahawk/database/TomahawkSqlQuery.h
index a54543a35..3a77bceb9 100644
--- a/src/libtomahawk/database/TomahawkSqlQuery.h
+++ b/src/libtomahawk/database/TomahawkSqlQuery.h
@@ -33,7 +33,7 @@ public:
     TomahawkSqlQuery();
     TomahawkSqlQuery( const QSqlDatabase& db );
 
-    static QString escape( const QString& identifier, QSqlDriver::IdentifierType type = QSqlDriver::FieldName );
+    static QString escape( QString identifier );
 
     bool exec( const QString& query );
     bool exec();