diff --git a/backend/mpc-system/services/service-party-android/app/src/main/java/com/durian/tssparty/presentation/viewmodel/MainViewModel.kt b/backend/mpc-system/services/service-party-android/app/src/main/java/com/durian/tssparty/presentation/viewmodel/MainViewModel.kt
index 94a22202..de346562 100644
--- a/backend/mpc-system/services/service-party-android/app/src/main/java/com/durian/tssparty/presentation/viewmodel/MainViewModel.kt
+++ b/backend/mpc-system/services/service-party-android/app/src/main/java/com/durian/tssparty/presentation/viewmodel/MainViewModel.kt
@@ -498,36 +498,15 @@ class MainViewModel @Inject constructor(
 
                     _uiState.update { it.copy(isLoading = false) }
 
-                    // If session is already in_progress, trigger keygen immediately (Solution B from Electron)
+                    // Match Electron behavior exactly:
+                    // If session is already in_progress, trigger keygen immediately
+                    // Otherwise wait for session_started event from gRPC subscription
+                    android.util.Log.d("MainViewModel", "Join result sessionStatus: ${joinResult.sessionStatus}")
                     if (joinResult.sessionStatus == "in_progress") {
-                        android.util.Log.d("MainViewModel", "Session already in_progress, triggering keygen immediately")
+                        android.util.Log.d("MainViewModel", "Session already in_progress, triggering keygen immediately (Solution B)")
                         startKeygenAsJoiner()
                     } else {
-                        // Otherwise, wait for session_started event
-                        // But also poll session status immediately and after delays in case we missed the event
-                        // This handles the race condition where session_started is sent before we're ready
-                        // The last joiner triggers session_started but can't receive it themselves
-                        viewModelScope.launch {
-                            // Poll multiple times with short delays
-                            for (attempt in 1..5) {
-                                delay(500) // Check every 500ms
-                                val joinInfo = pendingJoinKeygenInfo
-                                if (joinInfo == null || joinInfo.sessionId != sessionInfo.sessionId) {
-                                    android.util.Log.d("MainViewModel", "Polling cancelled - keygen already started or session changed")
-                                    break
-                                }
-                                android.util.Log.d("MainViewModel", "Polling session status (attempt $attempt)...")
-                                val statusResult = repository.getSessionStatus(sessionInfo.sessionId)
-                                statusResult.onSuccess { status ->
-                                    if (status.status == "in_progress" && pendingJoinKeygenInfo != null) {
-                                        android.util.Log.d("MainViewModel", "Session is now in_progress (detected via polling attempt $attempt), triggering keygen")
-                                        startKeygenAsJoiner()
-                                    }
-                                }
-                                // If keygen was triggered, break out of loop
-                                if (pendingJoinKeygenInfo == null) break
-                            }
-                        }
+                        android.util.Log.d("MainViewModel", "Joined session ${sessionInfo.sessionId}, waiting for session_started event")
                     }
                 },
                 onFailure = { e ->