diff --git a/apps/ai-game-creator-shell/src-tauri/src/game_package_upload/runtime.rs b/apps/ai-game-creator-shell/src-tauri/src/game_package_upload/runtime.rs
index cc76558c1..7e8920816 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/game_package_upload/runtime.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/game_package_upload/runtime.rs
@@ -90,8 +90,8 @@ async fn read_upload_state(
     if status >= 400 {
         let (code, message) = parse_server_error(status, &body);
         return Err(message
-            .or(code)
             .filter(|detail| !detail.trim().is_empty())
+            .or_else(|| code.filter(|detail| !detail.trim().is_empty()))
             .unwrap_or_else(|| format!("HTTP {status}")));
     }
     let parsed: Value = serde_json::from_str(&body)
@@ -145,8 +145,8 @@ async fn upload_chunk(
         let (code, message) = parse_server_error(status, &text);
         return Err(ChunkUploadError::Retryable(
             message
-                .or(code)
                 .filter(|detail| !detail.trim().is_empty())
+                .or_else(|| code.filter(|detail| !detail.trim().is_empty()))
                 .unwrap_or_else(|| format!("HTTP {status}")),
         ));
     }
@@ -154,8 +154,8 @@ async fn upload_chunk(
         let (code, message) = parse_server_error(status, &text);
         return Err(ChunkUploadError::Fatal(
             message
-                .or(code)
                 .filter(|detail| !detail.trim().is_empty())
+                .or_else(|| code.filter(|detail| !detail.trim().is_empty()))
                 .unwrap_or_else(|| format!("HTTP {status}")),
         ));
     }
@@ -198,8 +198,8 @@ async fn complete_upload(
     if status >= 400 {
         let (code, message) = parse_server_error(status, &text);
         return Err(message
-            .or(code)
             .filter(|detail| !detail.trim().is_empty())
+            .or_else(|| code.filter(|detail| !detail.trim().is_empty()))
             .unwrap_or_else(|| format!("HTTP {status}")));
     }
     let parsed: Value =