diff --git a/winpr/libwinpr/utils/collections/LinkedList.c b/winpr/libwinpr/utils/collections/LinkedList.c
index adb2af42f..939e85189 100644
--- a/winpr/libwinpr/utils/collections/LinkedList.c
+++ b/winpr/libwinpr/utils/collections/LinkedList.c
@@ -306,7 +306,7 @@ BOOL LinkedList_Enumerator_MoveNext(wLinkedList* list)
 {
 	if (list->initial)
 		list->initial = 0;
-	else
+	else if (list->current)
 		list->current = list->current->next;
 
 	if (!list->current)