diff --git a/reactos/ntoskrnl/ob/namespc.c b/reactos/ntoskrnl/ob/namespc.c
index 99a635c7d1f..075a218d707 100644
--- a/reactos/ntoskrnl/ob/namespc.c
+++ b/reactos/ntoskrnl/ob/namespc.c
@@ -221,7 +221,11 @@ ObpRemoveEntryDirectory(POBJECT_HEADER Header)
   DPRINT("ObpRemoveEntryDirectory(Header %x)\n",Header);
 
   KeAcquireSpinLock(&(Header->Parent->Lock),&oldlvl);
-  RemoveEntryList(&(Header->Entry));
+  if (Header->Entry.Flink && Header->Entry.Blink)
+  {
+    RemoveEntryList(&(Header->Entry));
+    Header->Entry.Flink = Header->Entry.Blink = NULL;
+  }
   KeReleaseSpinLock(&(Header->Parent->Lock),oldlvl);
 }