diff --git a/Apps/RuuviStation/Sources/Classes/Presentation/Modules/Settings/Submodules/Heartbeat/Presenter/HeartbeatPresenter.swift b/Apps/RuuviStation/Sources/Classes/Presentation/Modules/Settings/Submodules/Heartbeat/Presenter/HeartbeatPresenter.swift
index c29993ac6..e53744dc8 100644
--- a/Apps/RuuviStation/Sources/Classes/Presentation/Modules/Settings/Submodules/Heartbeat/Presenter/HeartbeatPresenter.swift
+++ b/Apps/RuuviStation/Sources/Classes/Presentation/Modules/Settings/Submodules/Heartbeat/Presenter/HeartbeatPresenter.swift
@@ -12,10 +12,11 @@ class HeartbeatPresenter: NSObject, HeartbeatModuleInput {
         viewModel.bgScanningState.value = settings.saveHeartbeats
         viewModel.bgScanningInterval.value = settings.saveHeartbeatsIntervalMinutes
 
-        bind(viewModel.bgScanningState, fire: false) { [weak self] _,
-            saveHeartbeats in
-            if !saveHeartbeats.bound {
-                self?.connectionPersistence.unpairAllConnection()
+        bind(viewModel.bgScanningState, fire: false) { observer, saveHeartbeats in
+            guard let saveHeartbeats else { return }
+            observer.settings.saveHeartbeats = saveHeartbeats
+            if !saveHeartbeats {
+                observer.connectionPersistence.unpairAllConnection()
             }
         }