diff --git a/src/Tgstation.Server.Host/Components/Engine/OpenDreamInstaller.cs b/src/Tgstation.Server.Host/Components/Engine/OpenDreamInstaller.cs
index bbd09ed1c1..6b356ba539 100644
--- a/src/Tgstation.Server.Host/Components/Engine/OpenDreamInstaller.cs
+++ b/src/Tgstation.Server.Host/Components/Engine/OpenDreamInstaller.cs
@@ -276,7 +276,9 @@ namespace Tgstation.Server.Host.Components.Engine
 							cancellationToken)));
 			}
 
-			await ValueTaskExtensions.WhenAll(MoveDirs(), MoveFiles());
+			var dirsMoveTask = MoveDirs();
+			var outputFilesMoveTask = MoveFiles();
+			await ValueTaskExtensions.WhenAll(dirsMoveTask, outputFilesMoveTask);
 			await IOManager.DeleteDirectory(sourcePath, cancellationToken);
 		}
 
diff --git a/src/Tgstation.Server.Host/Components/Engine/WindowsOpenDreamInstaller.cs b/src/Tgstation.Server.Host/Components/Engine/WindowsOpenDreamInstaller.cs
index 4062884604..c97ca10418 100644
--- a/src/Tgstation.Server.Host/Components/Engine/WindowsOpenDreamInstaller.cs
+++ b/src/Tgstation.Server.Host/Components/Engine/WindowsOpenDreamInstaller.cs
@@ -56,15 +56,18 @@ namespace Tgstation.Server.Host.Components.Engine
 
 		/// <inheritdoc />
 		public override ValueTask Install(EngineVersion version, string installPath, CancellationToken cancellationToken)
-			=> ValueTaskExtensions.WhenAll(
-				base.Install(
-					version,
-					installPath,
-					cancellationToken),
-				AddServerFirewallException(
-					version,
-					installPath,
-					cancellationToken));
+		{
+			var installTask = base.Install(
+				version,
+				installPath,
+				cancellationToken);
+			var firewallTask = AddServerFirewallException(
+				version,
+				installPath,
+				cancellationToken);
+
+			return ValueTaskExtensions.WhenAll(installTask, firewallTask);
+		}
 
 		/// <inheritdoc />
 		protected override async ValueTask HandleExtremelyLongPathOperation(Func<string, ValueTask> shortenedPathOperation, string originalPath, CancellationToken cancellationToken)