diff --git a/src/core/task_executor_utils.hpp b/src/core/task_executor_utils.hpp
index ad8d0d5b11..63e0a01e2b 100644
--- a/src/core/task_executor_utils.hpp
+++ b/src/core/task_executor_utils.hpp
@@ -50,16 +50,14 @@ class CORE_EXPORT WorkState
 
 // Helper function.
 // Run a task and wait for it to be finished.
-template<typename R, typename E, typename T>
+template<typename E, typename T>
 [[nodiscard]]
 auto evaluate(E& executor, const T& task)
 {
-    using PTask = std::packaged_task<R>;
-
-    PTask p_task(task);
+    std::packaged_task p_task(task);
 
     auto result_future = p_task.get_future();
-    ExecutorTraits<E, PTask>::exec(executor, std::move(p_task));
+    ExecutorTraits<E, decltype(p_task)>::exec(executor, std::move(p_task));
 
     result_future.wait();
 
diff --git a/src/database/database_tools/implementation/photos_analyzer.cpp b/src/database/database_tools/implementation/photos_analyzer.cpp
index 3e03a989cf..e3e095f462 100644
--- a/src/database/database_tools/implementation/photos_analyzer.cpp
+++ b/src/database/database_tools/implementation/photos_analyzer.cpp
@@ -138,9 +138,9 @@ namespace
 
         void perform() override
         {
-            using namespace Photo;
-            auto data = evaluate<Photo::ExplicitDelta<Field::Flags, Field::PHash, Field::Path, Field::Geometry, Field::Tags>(Database::IBackend &)>(*m_storage, [this](Database::IBackend& backend)
+            auto data = evaluate(*m_storage, [this](Database::IBackend& backend)
             {
+                using namespace Photo;
                 return backend.getPhotoDelta<Field::Flags, Field::PHash, Field::Path, Field::Geometry, Field::Tags>(m_id);
             });
 
diff --git a/src/database/database_tools/implementation/series_detector.cpp b/src/database/database_tools/implementation/series_detector.cpp
index f0e3283f6b..e1d3c0c5e1 100644
--- a/src/database/database_tools/implementation/series_detector.cpp
+++ b/src/database/database_tools/implementation/series_detector.cpp
@@ -371,7 +371,7 @@ std::vector<GroupCandidate> SeriesDetector::listCandidates(const Rules& rules) c
     timer.start();
 
     const std::deque<ExplicitDelta> candidates =
-        evaluate<std::deque<ExplicitDelta>(Database::IBackend &)>(m_db, [](Database::IBackend& backend)
+        evaluate(m_db, [](Database::IBackend& backend)
     {
         std::vector<GroupCandidate> result;
 
diff --git a/src/gui/desktop/quick_items/context_menu_manager.cpp b/src/gui/desktop/quick_items/context_menu_manager.cpp
index 0a44f135c4..4a5da9a8a4 100644
--- a/src/gui/desktop/quick_items/context_menu_manager.cpp
+++ b/src/gui/desktop/quick_items/context_menu_manager.cpp
@@ -169,7 +169,7 @@ void ContextMenuManager::manageGroupsAction()
 {
     Database::IDatabase& db = m_project->getDatabase();
 
-    const std::vector<ExplicitDelta> groupMembers = evaluate<std::vector<ExplicitDelta>(Database::IBackend &)>(db, [this](Database::IBackend& backend)
+    const std::vector<ExplicitDelta> groupMembers = evaluate(db, [this](Database::IBackend& backend)
     {
         std::vector<ExplicitDelta> members;
 
diff --git a/src/gui/desktop/utils/people_editor.cpp b/src/gui/desktop/utils/people_editor.cpp
index e3f44a54d5..2da7007e8c 100644
--- a/src/gui/desktop/utils/people_editor.cpp
+++ b/src/gui/desktop/utils/people_editor.cpp
@@ -58,7 +58,7 @@ namespace
 
     bool wasPhotoAnalyzedAndHasNoFaces(Database::IDatabase& db, const Photo::Id& ph_id)
     {
-        return evaluate<bool(Database::IBackend &)>(db, [ph_id](Database::IBackend& backend)
+        return evaluate(db, [ph_id](Database::IBackend& backend)
         {
             const auto analysisState = backend.get(ph_id, FacesAnalysisState);
 
@@ -68,7 +68,7 @@ namespace
 
     QString pathFor(Database::IDatabase& db, const Photo::Id& id)
     {
-        return evaluate<QString(Database::IBackend &)>(db, [id](Database::IBackend& backend)
+        return evaluate(db, [id](Database::IBackend& backend)
         {
             auto photo = backend.getPhotoDelta(id, {Photo::Field::Path});
 
@@ -173,7 +173,7 @@ class Recognizer: public IRecognizePerson
         {
             typedef std::tuple<std::vector<Person::Fingerprint>, std::vector<Person::Id>> Result;
 
-            evaluate<void(Database::IBackend &)>(db, [this](Database::IBackend& backend)
+            evaluate(db, [this](Database::IBackend& backend)
             {
                 std::vector<Person::Fingerprint> people_fingerprints;
                 std::vector<Person::Id> people;
@@ -238,7 +238,7 @@ FaceEditor::PeopleData FaceEditor::findFaces(const OrientedImage& image, const P
     // photo not analyzed yet (no records in db) or analyzed and we have data in db
     if (facesNotFound == false)
     {
-        result = evaluate<FaceEditor::PeopleData(Database::IBackend &)>(m_db, [id](Database::IBackend& backend)
+        result = evaluate(m_db, [id](Database::IBackend& backend)
         {
             return backend.getPhotoDelta<Photo::Field::People>(id);
         });
@@ -262,7 +262,7 @@ FaceEditor::PeopleData FaceEditor::findFaces(const OrientedImage& image, const P
             else
             {
                 // store face location and fingerprint in db and update ids
-                evaluate<void(Database::IBackend &)>(m_db, [&result](Database::IBackend& backend)
+                evaluate(m_db, [&result](Database::IBackend& backend)
                 {
                     backend.update({result});
 
diff --git a/src/gui/desktop/utils/thumbnail_manager.cpp b/src/gui/desktop/utils/thumbnail_manager.cpp
index 0b28c223b1..ce1a54e19d 100644
--- a/src/gui/desktop/utils/thumbnail_manager.cpp
+++ b/src/gui/desktop/utils/thumbnail_manager.cpp
@@ -67,7 +67,7 @@ void ThumbnailManager::fetch(const Photo::Id& id, const QSize& desired_size, con
             QByteArray dbThumb;
 
             if (m_db)                   // load thumbnail from db
-                dbThumb = evaluate<QByteArray(Database::IBackend &)>(*m_db, [id](Database::IBackend& backend)
+                dbThumb = evaluate(*m_db, [id](Database::IBackend& backend)
                 {
                     return backend.readBlob(id, BlobType);
                 });
@@ -78,7 +78,7 @@ void ThumbnailManager::fetch(const Photo::Id& id, const QSize& desired_size, con
             if (dbThumb.isNull())
             {
                 // load path to photo
-                const Photo::DataDelta photoData = evaluate<Photo::DataDelta(Database::IBackend &)>(*m_db, [id](Database::IBackend& backend)
+                const Photo::DataDelta photoData = evaluate(*m_db, [id](Database::IBackend& backend)
                 {
                     return backend.getPhotoDelta<Photo::Field::Path>(id);
                 });