diff --git a/src/Tgstation.Server.Host/Core/JobManager.cs b/src/Tgstation.Server.Host/Core/JobManager.cs
index bb2833d916..e4e13aa4d9 100644
--- a/src/Tgstation.Server.Host/Core/JobManager.cs
+++ b/src/Tgstation.Server.Host/Core/JobManager.cs
@@ -80,15 +80,11 @@ namespace Tgstation.Server.Host.Core
 					{
 						var oldJob = job;
 						job = new Job { Id = oldJob.Id };
-						try
-						{
-							await operation(job, scope.ServiceProvider, cancellationToken).ConfigureAwait(false);
-						}
-						finally
-						{
-							databaseContext = scope.ServiceProvider.GetRequiredService<IDatabaseContext>();
-							databaseContext.Jobs.Attach(job);
-						}
+						databaseContext = scope.ServiceProvider.GetRequiredService<IDatabaseContext>();
+						databaseContext.Jobs.Attach(job);
+
+						await operation(job, scope.ServiceProvider, cancellationToken).ConfigureAwait(false);
+
 						logger.LogDebug("Job {0} completed!", job.Id);
 					}
 					catch (OperationCanceledException)