diff --git a/src/system/kernel/kernel_daemon.cpp b/src/system/kernel/kernel_daemon.cpp
index 4303b3334d..833daadce2 100644
--- a/src/system/kernel/kernel_daemon.cpp
+++ b/src/system/kernel/kernel_daemon.cpp
@@ -182,6 +182,9 @@ KernelDaemon::_NextDaemon(struct daemon& marker)
 	} else {
 		daemon = marker.GetDoublyLinkedListLink()->next;
 		fDaemons.Remove(&marker);
+
+		marker.GetDoublyLinkedListLink()->next = NULL;
+		marker.GetDoublyLinkedListLink()->previous = NULL;
 	}
 
 	if (daemon != NULL)