diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt
index 78b9836a..629a782a 100644
--- a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt
+++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt
@@ -70,10 +70,27 @@ class HTSRepository @Inject constructor(
 
     val isRunning = data.map { it.connectionState?.state == GattConnectionState.STATE_CONNECTED }
 
+    private var isOnScreen = false
+    private var isServiceRunning = false
+
     fun launch(device: ServerDevice) {
         serviceManager.startService(HTSService::class.java, device)
     }
 
+    fun setOnScreen(isOnScreen: Boolean) {
+        this.isOnScreen = isOnScreen
+
+        if (shouldClean()) clean()
+    }
+
+    fun setServiceRunning(serviceRunning: Boolean) {
+        this.isServiceRunning = serviceRunning
+
+        if (shouldClean()) clean()
+    }
+
+    private fun shouldClean() = !isOnScreen && !isServiceRunning
+
     internal fun setTemperatureUnit(temperatureUnit: TemperatureUnit) {
         _data.value = _data.value.copy(temperatureUnit = temperatureUnit)
     }
@@ -98,7 +115,7 @@ class HTSRepository @Inject constructor(
         _stopEvent.tryEmit(DisconnectAndStopEvent())
     }
 
-    fun clear() {
+    private fun clean() {
         logger = null
         _data.value = HTSServiceData()
     }
diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSService.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSService.kt
index cf6e783f..5d0c27e4 100644
--- a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSService.kt
+++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSService.kt
@@ -79,6 +79,8 @@ internal class HTSService : NotificationService() {
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         super.onStartCommand(intent, flags, startId)
 
+        repository.setServiceRunning(true)
+
         val device = intent!!.getParcelableExtra<ServerDevice>(DEVICE_DATA)!!
 
         startGattClient(device)
@@ -147,6 +149,6 @@ internal class HTSService : NotificationService() {
 
     override fun onDestroy() {
         super.onDestroy()
-        repository.clear()
+        repository.setServiceRunning(false)
     }
 }
diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt
index df6535ed..2e1f9969 100644
--- a/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt
+++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt
@@ -31,6 +31,7 @@
 
 package no.nordicsemi.android.hts.view
 
+import android.util.Log
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
@@ -57,6 +58,8 @@ fun HTSScreen() {
     val state = viewModel.state.collectAsState().value
     val deviceName = viewModel.deviceName.collectAsState().value
 
+    Log.d("AAATESTAAA", "State: $state")
+
     val navigateUp = { viewModel.onEvent(NavigateUp) }
 
     Scaffold(
diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/viewmodel/HTSViewModel.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/viewmodel/HTSViewModel.kt
index e1f854e2..64d4abb1 100644
--- a/profile_hts/src/main/java/no/nordicsemi/android/hts/viewmodel/HTSViewModel.kt
+++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/viewmodel/HTSViewModel.kt
@@ -71,6 +71,8 @@ internal class HTSViewModel @Inject constructor(
     val deviceName = _deviceName.asStateFlow()
 
     init {
+        repository.setOnScreen(true)
+
         viewModelScope.launch {
             if (repository.isRunning.firstOrNull() == false) {
                 requestBluetoothDevice()
@@ -121,4 +123,9 @@ internal class HTSViewModel @Inject constructor(
     private fun onTemperatureUnitSelected(event: OnTemperatureUnitSelected) {
         repository.setTemperatureUnit(event.value)
     }
+
+    override fun onCleared() {
+        super.onCleared()
+        repository.setOnScreen(false)
+    }
 }