diff --git a/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/JpaWorkspaceActivityDao.java b/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/JpaWorkspaceActivityDao.java
index 7afe2989eb..68dd3b7061 100644
--- a/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/JpaWorkspaceActivityDao.java
+++ b/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/JpaWorkspaceActivityDao.java
@@ -67,12 +67,10 @@ public class JpaWorkspaceActivityDao implements WorkspaceActivityDao {
     try {
       return managerProvider
           .get()
-          .createNamedQuery("WorkspaceActivity.getExpiredRunTimeout", WorkspaceActivity.class)
-          .setParameter("timestamp", timestamp)
-          .setParameter("runTimeout", runTimeout)
+          .createNamedQuery("WorkspaceActivity.getExpiredRunTimeout", String.class)
+          .setParameter("timeDifference", timestamp - runTimeout)
           .getResultList()
           .stream()
-          .map(WorkspaceActivity::getWorkspaceId)
           .collect(Collectors.toList());
     } catch (RuntimeException x) {
       throw new ServerException(x.getLocalizedMessage(), x);
@@ -85,11 +83,10 @@ public class JpaWorkspaceActivityDao implements WorkspaceActivityDao {
     try {
       return managerProvider
           .get()
-          .createNamedQuery("WorkspaceActivity.getExpiredIdle", WorkspaceActivity.class)
+          .createNamedQuery("WorkspaceActivity.getExpiredIdle", String.class)
           .setParameter("expiration", timestamp)
           .getResultList()
           .stream()
-          .map(WorkspaceActivity::getWorkspaceId)
           .collect(Collectors.toList());
     } catch (RuntimeException x) {
       throw new ServerException(x.getLocalizedMessage(), x);
diff --git a/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/WorkspaceActivity.java b/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/WorkspaceActivity.java
index 48f64e420e..944448c17f 100644
--- a/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/WorkspaceActivity.java
+++ b/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/WorkspaceActivity.java
@@ -27,13 +27,13 @@ import org.eclipse.che.api.core.model.workspace.WorkspaceStatus;
 @NamedQueries({
   @NamedQuery(
       name = "WorkspaceActivity.getExpiredIdle",
-      query = "SELECT a FROM WorkspaceActivity a WHERE a.expiration < :expiration"),
+      query = "SELECT a.workspaceId FROM WorkspaceActivity a WHERE a.expiration < :expiration"),
   @NamedQuery(
       name = "WorkspaceActivity.getExpiredRunTimeout",
       query =
-          "SELECT a FROM WorkspaceActivity a WHERE "
+          "SELECT a.workspaceId FROM WorkspaceActivity a WHERE "
               + "(a.status = org.eclipse.che.api.core.model.workspace.WorkspaceStatus.RUNNING AND "
-              + "a.lastRunning < :timestamp - :runTimeout)"),
+              + "a.lastRunning < :timeDifference)"),
   @NamedQuery(
       name = "WorkspaceActivity.getStoppedSince",
       query =