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 f18adee5..e4b83438 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
@@ -29,7 +29,7 @@ class IdleResult<T> : BleManagerResult<T>
 class ConnectingResult<T>(device: BluetoothDevice) : DeviceHolder(device), BleManagerResult<T>
 class SuccessResult<T>(device: BluetoothDevice, val data: T) : DeviceHolder(device), BleManagerResult<T>
 
-class LinkLossResult<T>(device: BluetoothDevice, val data: T) : DeviceHolder(device), BleManagerResult<T>
+class LinkLossResult<T>(device: BluetoothDevice, val data: T?) : DeviceHolder(device), BleManagerResult<T>
 class DisconnectedResult<T>(device: BluetoothDevice) : DeviceHolder(device), BleManagerResult<T>
 class UnknownErrorResult<T>(device: BluetoothDevice) : DeviceHolder(device), BleManagerResult<T>
 class MissingServiceResult<T>(device: BluetoothDevice) : DeviceHolder(device), BleManagerResult<T>
diff --git a/lib_service/src/main/java/no/nordicsemi/android/service/ConnectionObserverAdapter.kt b/lib_service/src/main/java/no/nordicsemi/android/service/ConnectionObserverAdapter.kt
index c61477d5..bfead4ec 100644
--- a/lib_service/src/main/java/no/nordicsemi/android/service/ConnectionObserverAdapter.kt
+++ b/lib_service/src/main/java/no/nordicsemi/android/service/ConnectionObserverAdapter.kt
@@ -46,7 +46,7 @@ class ConnectionObserverAdapter<T> : ConnectionObserver {
         Log.d(TAG, "onDeviceDisconnected(), reason: $reason")
         _status.value = when (reason) {
             ConnectionObserver.REASON_NOT_SUPPORTED -> MissingServiceResult(device)
-            ConnectionObserver.REASON_LINK_LOSS -> LinkLossResult(device, getData()!!)
+            ConnectionObserver.REASON_LINK_LOSS -> LinkLossResult(device, getData())
             ConnectionObserver.REASON_SUCCESS -> DisconnectedResult(device)
             else -> UnknownErrorResult(device)
         }
diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt
index 775623fc..1c7b03c6 100644
--- a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt
+++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt
@@ -1,6 +1,5 @@
 package no.nordicsemi.android.prx.repository
 
-import android.bluetooth.BluetoothDevice
 import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineScope
@@ -68,7 +67,8 @@ class PRXRepository @Inject internal constructor(
             }
         }
         (result as? LinkLossResult<PRXData>)?.let {
-            alarmHandler.playAlarm(it.data.linkLossAlarmLevel)
+            val alarmLevel = it.data?.linkLossAlarmLevel ?: AlarmLevel.HIGH
+            alarmHandler.playAlarm(alarmLevel)
         }
     }