diff --git a/app/src/main/java/com/omixlab/lckcontrol/app/ui/login/LoginScreen.kt b/app/src/main/java/com/omixlab/lckcontrol/app/ui/login/LoginScreen.kt
index 7a14e0a..88b2d74 100644
--- a/app/src/main/java/com/omixlab/lckcontrol/app/ui/login/LoginScreen.kt
+++ b/app/src/main/java/com/omixlab/lckcontrol/app/ui/login/LoginScreen.kt
@@ -26,6 +26,11 @@ fun LoginScreen(
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
+    // Start scanning each time the login screen appears
+    LaunchedEffect(Unit) {
+        viewModel.startScan()
+    }
+
     LaunchedEffect(uiState.loginSuccess) {
         if (uiState.loginSuccess) onLoginSuccess()
     }
diff --git a/app/src/main/java/com/omixlab/lckcontrol/app/ui/login/LoginViewModel.kt b/app/src/main/java/com/omixlab/lckcontrol/app/ui/login/LoginViewModel.kt
index f31011b..997b2b0 100644
--- a/app/src/main/java/com/omixlab/lckcontrol/app/ui/login/LoginViewModel.kt
+++ b/app/src/main/java/com/omixlab/lckcontrol/app/ui/login/LoginViewModel.kt
@@ -57,10 +57,6 @@ class LoginViewModel @Inject constructor(
     private var scanJob: Job? = null
     private val lanTls by lazy { LanTlsFactory.create(context) }
 
-    init {
-        startScan()
-    }
-
     fun startScan() {
         scanJob?.cancel()
         _uiState.value = LoginUiState(phase = LoginPhase.SCANNING)