diff --git a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
index c031f55a4d..4d9f1aa9b4 100644
--- a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
+++ b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
@@ -238,13 +238,13 @@ namespace Tgstation.Server.Host.Components.Deployment
 					await controller.Lifetime.WithToken(cancellationToken).ConfigureAwait(false);
 
 				if (!controller.Lifetime.IsCompleted)
-				{
-					if (requireValidate)
-						throw new JobException(ErrorCode.DreamMakerNeverValidated);
 					await controller.DisposeAsync().ConfigureAwait(false);
-				}
 
 				validationStatus = controller.ApiValidationStatus;
+
+				if (requireValidate && validationStatus == ApiValidationStatus.NeverValidated)
+					throw new JobException(ErrorCode.DreamMakerNeverValidated);
+
 				logger.LogTrace("API validation status: {0}", validationStatus);
 
 				job.DMApiVersion = controller.DMApiVersion;