diff --git a/internal/pkg/core/device_handler.go b/internal/pkg/core/device_handler.go
index 58bf3bd..ea6eedf 100755
--- a/internal/pkg/core/device_handler.go
+++ b/internal/pkg/core/device_handler.go
@@ -3145,6 +3145,12 @@
 	if dh.isReadIndicationRoutineActive {
 		dh.stopIndications <- true
 	}
+
+	// stop the heartbeat check routine
+	if dh.isHeartbeatCheckActive {
+		dh.stopHeartbeatCheck <- true
+	}
+
 	dh.lockDevice.RUnlock()
 
 	if err = dh.updateDeviceStateInCore(ctx, &ca.DeviceStateFilter{
@@ -3174,10 +3180,7 @@
 	if dh.isCollectorActive {
 		dh.stopCollector <- true
 	}
-	// stop the heartbeat check routine
-	if dh.isHeartbeatCheckActive {
-		dh.stopHeartbeatCheck <- true
-	}
+
 	dh.lockDevice.RUnlock()
 
 	dh.StopAllFlowRoutines(ctx)