diff --git a/core/archipelago/src/api/rpc/package/install.rs b/core/archipelago/src/api/rpc/package/install.rs
index 90374800..04016d89 100644
--- a/core/archipelago/src/api/rpc/package/install.rs
+++ b/core/archipelago/src/api/rpc/package/install.rs
@@ -612,19 +612,27 @@ impl RpcHandler {
         }
 
         // Timeout primary pull after 60s — if registry is down, fail fast to fallback
-        let status = tokio::time::timeout(
+        let timed_out;
+        let status = match tokio::time::timeout(
             std::time::Duration::from_secs(60),
             child.wait(),
         )
         .await
-        .unwrap_or_else(|_| {
-            // Timeout: kill the stuck process
-            let _ = child.kill();
-            tracing::warn!("Image pull timed out after 60s: {}", docker_image);
-            Ok(std::process::ExitStatus::default())
-        })
-        .context("Failed to wait for image pull")?;
-        if !status.success() {
+        {
+            Ok(result) => {
+                timed_out = false;
+                result.context("Failed to wait for image pull")?
+            }
+            Err(_) => {
+                // Timeout: kill the stuck process
+                tracing::warn!("Image pull timed out after 60s: {}", docker_image);
+                let _ = child.kill().await;
+                timed_out = true;
+                // Wait for process to actually exit after kill
+                child.wait().await.context("Failed to wait after kill")?
+            }
+        };
+        if timed_out || !status.success() {
             // Try all configured fallback registries dynamically
             match crate::container::registry::pull_from_registries(
                 &self.config.data_dir,