diff --git a/core/host/src/hdf_device.c b/core/host/src/hdf_device.c
index d61036007dacfdc41726ca361f5187fb5182b04a..451faf9923d029edcbb12753d76a4824074ebfc7 100644
--- a/core/host/src/hdf_device.c
+++ b/core/host/src/hdf_device.c
@@ -39,7 +39,8 @@ void HdfDeviceConstruct(struct HdfDevice *device)
 void HdfDeviceDestruct(struct HdfDevice *device)
 {
     struct HdfDeviceNode *devNode = NULL;
-    DLIST_FOR_EACH_ENTRY(devNode, &device->devNodes, struct HdfDeviceNode, entry) {
+    struct HdfDeviceNode *devNodeTmp = NULL;
+    DLIST_FOR_EACH_ENTRY_SAFE(devNode, devNodeTmp, &device->devNodes, struct HdfDeviceNode, entry) {
         HdfDeviceNodeDelete(devNode);
     }
     DListHeadInit(&device->devNodes);