diff --git a/libs/resources/KisResourceQueryMapper.cpp b/libs/resources/KisResourceQueryMapper.cpp
index b2c52ca22d8dccf3903bd27604a349b60e59cb1d..ab20126db43a3d6490c9c6b62c64655e6d2ffdbc 100644
--- a/libs/resources/KisResourceQueryMapper.cpp
+++ b/libs/resources/KisResourceQueryMapper.cpp
@@ -20,7 +20,6 @@
 QVariant KisResourceQueryMapper::variantFromResourceQuery(const QSqlQuery &query, int column, int role)
 {
     const QString resourceType = query.value("resource_type").toString();
-    KisResourceModel resourceModel(resourceType);
 
     switch(role) {
     case Qt::DisplayRole:
@@ -107,6 +106,7 @@ QVariant KisResourceQueryMapper::variantFromResourceQuery(const QSqlQuery &query
         return query.value("resource_type");
     case Qt::UserRole + KisAbstractResourceModel::Tags:
     {
+        KisResourceModel resourceModel(resourceType);
         QStringList tagNames;
         Q_FOREACH(const KisTagSP tag, resourceModel.tagsForResource(query.value("id").toInt())) {
             tagNames << tag->name();
@@ -124,6 +124,7 @@ QVariant KisResourceQueryMapper::variantFromResourceQuery(const QSqlQuery &query
         }
         else {
             // Now we have to check the resource, but that's cheap since it's been loaded in any case
+            KisResourceModel resourceModel(resourceType);
             KoResourceSP resource = resourceModel.resourceForId(query.value("id").toInt());
             return resource->isDirty();
         }