diff --git a/source/RobotAPI/drivers/HokuyoLaserUnit/HokuyoLaserUnit.cpp b/source/RobotAPI/drivers/HokuyoLaserUnit/HokuyoLaserUnit.cpp
index 0d67c40a799d88c4b5471e6ea7a99004b40a398b..2a1f02718bb8b1fa9465445086238a4e04ba92dd 100644
--- a/source/RobotAPI/drivers/HokuyoLaserUnit/HokuyoLaserUnit.cpp
+++ b/source/RobotAPI/drivers/HokuyoLaserUnit/HokuyoLaserUnit.cpp
@@ -114,7 +114,7 @@ HokuyoLaserUnit::onConnectComponent()
         }
 
         ARMARX_CHECK_NOT_NULL(heartbeat);
-        heartbeat->signUp(device.componentName + "_" + device.ip,
+        heartbeat->signUp(device.ip,
                           armarx::core::time::Duration::MilliSeconds(500),
                           armarx::core::time::Duration::MilliSeconds(800),
                           {"LaserScanner", "Localization"},
@@ -284,7 +284,7 @@ HokuyoLaserScanDevice::run()
 
             if (robotHealthPlugin != nullptr)
             {
-                robotHealthPlugin->heartbeatOnChannel(componentName + "_" + ip);
+                robotHealthPlugin->heartbeatOnChannel(ip);
             }
             else
             {