diff --git a/reactos/lib/rtl/generictable.c b/reactos/lib/rtl/generictable.c
index 7e5752a2efe..0c4c7a9a33a 100644
--- a/reactos/lib/rtl/generictable.c
+++ b/reactos/lib/rtl/generictable.c
@@ -34,7 +34,11 @@ RtlpFindGenericTableNodeOrParent(IN PRTL_GENERIC_TABLE Table,
     RTL_GENERIC_COMPARE_RESULTS Result;
 
     /* Quick check to see if the table is empty */
-    if (RtlIsGenericTableEmpty(Table)) return TableEmptyTree;
+    if (RtlIsGenericTableEmpty(Table))
+    {
+        *NodeOrParent = NULL;
+        return TableEmptyTree;
+    }
 
     /* Set the current node */
     CurrentNode = Table->TableRoot;