diff --git a/projects/tentacles/src/python/tentacles/sql/jobs.sql b/projects/tentacles/src/python/tentacles/sql/jobs.sql
index 86bc233..0eba47c 100644
--- a/projects/tentacles/src/python/tentacles/sql/jobs.sql
+++ b/projects/tentacles/src/python/tentacles/sql/jobs.sql
@@ -84,6 +84,7 @@ SELECT
  , j.cancelled_at
  , j.finished_at
  , j.user_id
+ , j.printer_id
 FROM jobs j
 INNER JOIN files f
   ON j.file_id = f.id
diff --git a/projects/tentacles/src/python/tentacles/workers.py b/projects/tentacles/src/python/tentacles/workers.py
index 0b97635..e3f500c 100644
--- a/projects/tentacles/src/python/tentacles/workers.py
+++ b/projects/tentacles/src/python/tentacles/workers.py
@@ -152,6 +152,11 @@ def assign_jobs(app: App, db: Db) -> None:
     """Assign jobs to printers. Uploading files and job state management is handled separately."""
 
     for job in db.list_job_queue(uid=None):
+        # FIXME: Jobs which have been mapped are still in the "queue" until they finish
+        # Ignore such as they have already been mapped
+        if job.printer_id:
+            continue
+
         for printer in db.list_idle_printers():
             if (
                 job.analysis_id is not None