diff --git a/backend/mpc-system/services/service-party-android/build-apk.bat b/backend/mpc-system/services/service-party-android/build-apk.bat
index 83fe6a2c..b7c49516 100644
--- a/backend/mpc-system/services/service-party-android/build-apk.bat
+++ b/backend/mpc-system/services/service-party-android/build-apk.bat
@@ -75,6 +75,20 @@ echo [INFO] Using SDK from local.properties
 type local.properties
 echo.
 
+:: Parse rebuild argument early - must happen BEFORE checking tsslib.aar
+set REBUILD_REQUESTED=0
+if "%1"=="rebuild" (
+    set REBUILD_REQUESTED=1
+    echo [INFO] Rebuild requested - deleting tsslib.aar to recompile Go code...
+    if exist "app\libs\tsslib.aar" (
+        del /f "app\libs\tsslib.aar"
+        echo [INFO] tsslib.aar deleted, will be rebuilt
+    ) else (
+        echo [INFO] tsslib.aar not found, will be built fresh
+    )
+    echo.
+)
+
 :: Check and build tsslib.aar if needed
 if not exist "app\libs\tsslib.aar" (
     echo [INFO] tsslib.aar not found, attempting to build TSS library...
@@ -186,17 +200,9 @@ if "%1"=="clean" set BUILD_TYPE=clean
 if "%1"=="rebuild" set BUILD_TYPE=rebuild
 if "%1"=="help" goto :show_help
 
-:: Handle rebuild - delete tsslib.aar to force recompilation of Go code
+:: Handle rebuild - aar deletion already done above, just set build type
 if "%BUILD_TYPE%"=="rebuild" (
-    echo [INFO] Rebuild requested - deleting tsslib.aar to recompile Go code...
-    if exist "app\libs\tsslib.aar" (
-        del /f "app\libs\tsslib.aar"
-        echo [INFO] tsslib.aar deleted, will be rebuilt
-    ) else (
-        echo [INFO] tsslib.aar not found, will be built fresh
-    )
     set BUILD_TYPE=all
-    echo.
 )
 
 :: Show build type