diff --git a/core/lomas_core/models/constants.py b/core/lomas_core/models/constants.py
index 2cca8058a..5b5671960 100644
--- a/core/lomas_core/models/constants.py
+++ b/core/lomas_core/models/constants.py
@@ -148,22 +148,3 @@ def get_lomas_logger(name: str, level: str = "NOTSET") -> logging.Logger:
     logging.getLogger(name).setLevel(level)
 
     return logging.getLogger(name)
-
-
-# Exceptions
-# -----------------------------------------------------------------------------
-
-
-class ExceptionType(StrEnum):
-    """Lomas server exception types.
-
-    To be used as discriminator when parsing corresponding models
-    """
-
-    INVALID_QUERY = "InvalidQueryException"
-    USER_NOT_FOUND = "UserNotFoundException"
-    DATASET_NOT_FOUND = "DatasetNotFoundException"
-    JOB_NOT_FOUND = "JobNotFoundException"
-    EXTERNAL_LIBRARY = "ExternalLibraryException"
-    UNAUTHORIZED_ACCESS = "UnauthorizedAccessException"
-    INTERNAL_SERVER = "InternalServerException"
diff --git a/server/lomas_server/admin_database/local_database.py b/server/lomas_server/admin_database/local_database.py
index c7920de44..b66147281 100644
--- a/server/lomas_server/admin_database/local_database.py
+++ b/server/lomas_server/admin_database/local_database.py
@@ -2,6 +2,7 @@
 import sqlite3
 from collections.abc import Generator
 from contextlib import AbstractContextManager, closing, contextmanager, nullcontext
+from datetime import timedelta
 from pathlib import Path
 from tempfile import SpooledTemporaryFile
 from typing import Any, BinaryIO, override
@@ -232,11 +233,37 @@ def get_job(self, uid: UUID, current_conn: sqlite3.Connection | None = None) ->
 
         return Job.model_validate_json(row[0])
 
+    @db_span("db.expire_jobs", table="admin-db")
+    def expire_jobs(self, delay: timedelta = timedelta(seconds=2)) -> list[UUID]:
+        ADMINDB_QUERY_COUNTER.add(1, {"operation": "exipre_jobs"})
+
+        with _sqlite_connection(self._db_path) as conn:
+            rows = conn.execute(
+                """
+                UPDATE jobs
+                SET
+                    status = ?
+                WHERE
+                    status = ?
+                    AND
+                    (unixepoch('now') - started_at) > ?
+                RETURNING uid;
+                """,
+                (str(JobStatus.PENDING), str(JobStatus.IN_PROGRESS), int(delay.total_seconds())),
+            ).fetchall()
+
+        for row in rows:
+            logger.debug(f"expiring Job {row[0]}")
+
+        return [UUID(row[0]) for row in rows]
+
     @override
     @db_span("db.get_job_pending", table="admin-db")
     def get_job_pending(self) -> Job | None:
         ADMINDB_QUERY_COUNTER.add(1, {"operation": "get_job_pending"})
 
+        self.expire_jobs()
+
         with _sqlite_connection(self._db_path) as conn:
             row = conn.execute(
                 "SELECT job_json FROM jobs WHERE status = ? ORDER BY started_at LIMIT 1",
@@ -257,7 +284,7 @@ def put_job(self, job: Job) -> None:
                 conn.execute(
                     "INSERT INTO jobs "
                     "(uid, user_name, dataset_name, status, started_at, job_json) "
-                    "VALUES (?, ?, ?, ?, 'now', ?)",
+                    "VALUES (?, ?, ?, ?, unixepoch('now'), ?)",
                     (
                         str(job.uid),
                         job.requested_by,
diff --git a/server/lomas_server/routes/utils.py b/server/lomas_server/routes/utils.py
index c8b7b34b2..aeb3e4abf 100644
--- a/server/lomas_server/routes/utils.py
+++ b/server/lomas_server/routes/utils.py
@@ -190,7 +190,6 @@ def handle_query_to_job(
 
     new_task = Job(requested_by=user.name, dataset_name=dataset_name, query=query)
 
-    # app.state.jobs[str(new_task.uid)] = new_task
     admin_database.put_job(new_task)
 
     return new_task