diff --git a/lib_service/src/main/java/no/nordicsemi/android/service/BleManagerStatus.kt b/lib_service/src/main/java/no/nordicsemi/android/service/BleManagerStatus.kt
index 7ed46832..cc4046a5 100644
--- a/lib_service/src/main/java/no/nordicsemi/android/service/BleManagerStatus.kt
+++ b/lib_service/src/main/java/no/nordicsemi/android/service/BleManagerStatus.kt
@@ -13,6 +13,10 @@ sealed class BleManagerResult <T> {
     fun hasBeenDisconnected(): Boolean {
         return this is LinkLossResult || this is DisconnectedResult || this is MissingServiceResult
     }
+
+    fun hasBeenDisconnectedWithoutLinkLoss(): Boolean {
+        return this is DisconnectedResult || this is MissingServiceResult
+    }
 }
 
 class ConnectingResult<T> : BleManagerResult<T>()
diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/data/PRXRepository.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/data/PRXRepository.kt
index f2e1be37..ce996361 100644
--- a/profile_prx/src/main/java/no/nordicsemi/android/prx/data/PRXRepository.kt
+++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/data/PRXRepository.kt
@@ -11,10 +11,7 @@ import no.nordicsemi.android.prx.repository.AlarmHandler
 import no.nordicsemi.android.prx.repository.PRXManager
 import no.nordicsemi.android.prx.repository.PRXService
 import no.nordicsemi.android.prx.repository.ProximityServerManager
-import no.nordicsemi.android.service.BleManagerResult
-import no.nordicsemi.android.service.ConnectingResult
-import no.nordicsemi.android.service.ServiceManager
-import no.nordicsemi.android.service.SuccessResult
+import no.nordicsemi.android.service.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -33,7 +30,7 @@ class PRXRepository @Inject internal constructor(
     internal val data = _data.asStateFlow()
 
     val isRunning = data.map { it.isRunning() }
-    val hasBeenDisconnected = data.map { it.hasBeenDisconnected() }
+    val hasBeenDisconnectedWithoutLinkLoss = data.map { it.hasBeenDisconnectedWithoutLinkLoss() }
 
     fun launch(device: BluetoothDevice) {
         serviceManager.startService(PRXService::class.java, device)
@@ -50,20 +47,14 @@ class PRXRepository @Inject internal constructor(
             handleLocalAlarm(it)
         }.launchIn(scope)
 
-        scope.launch {
-            manager.start(device)
-        }
+        manager.start(device)
     }
 
-    private suspend fun PRXManager.start(device: BluetoothDevice) {
-        try {
-            connect(device)
-                .useAutoConnect(false)
-                .retry(3, 100)
-                .suspend()
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
+    private fun PRXManager.start(device: BluetoothDevice) {
+        connect(device)
+            .useAutoConnect(true)
+            .retry(3, 100)
+            .enqueue()
     }
 
     private fun handleLocalAlarm(result: BleManagerResult<PRXData>) {
@@ -74,6 +65,10 @@ class PRXRepository @Inject internal constructor(
                 alarmHandler.pauseAlarm()
             }
         }
+//        (result as? LinkLossResult<PRXData>)?.let {
+//            alarmHandler.playAlarm(it.data.localAlarmLevel)
+//            repository.setLocalAlarmLevel(repository.data.value.linkLossAlarmLevel)
+//        }
     }
 
     fun enableAlarm() {
diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt
index b74ba9a3..82ae7e38 100644
--- a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt
+++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt
@@ -24,7 +24,7 @@ internal class PRXService : NotificationService() {
 
         repository.start(device, lifecycleScope)
 
-        repository.hasBeenDisconnected.onEach {
+        repository.hasBeenDisconnectedWithoutLinkLoss.onEach {
             if (it) stopSelf()
         }.launchIn(lifecycleScope)