diff --git a/webservice/job_monitor.py b/webservice/job_monitor.py
index f7d841321a33a558db504eb72bb9d1fc31016a4d..b447488772cd090cd63fc346da6969ba24759f2d 100644
--- a/webservice/job_monitor.py
+++ b/webservice/job_monitor.py
@@ -25,7 +25,7 @@ log = logging.getLogger(__name__)
 
 STATES_FINISHED = {  # https://slurm.schedmd.com/squeue.html#lbAG
     'BOOT_FAIL',  'CANCELLED', 'COMPLETED',  'DEADLINE', 'FAILED',
-    'OUT_OF_MEMORY', 'PREEMPTED', 'SPECIAL_EXIT', 'TIMEOUT',
+    'OUT_OF_MEMORY', 'SPECIAL_EXIT', 'TIMEOUT',
 }
 
 
@@ -55,7 +55,7 @@ def slurm_status(filter_user=True):
     :return: a dictionary indexed by slurm jobid and containing a tuple
              of (status, run time) as values.
     """
-    cmd = ["squeue"]
+    cmd = ["squeue", "--states=all"]
     if filter_user:
         cmd += ["--me"]
     res = run(cmd, stdout=PIPE, stderr=PIPE)