diff --git a/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp
index 37252eb09b..342f066078 100644
--- a/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp
+++ b/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp
@@ -253,7 +253,13 @@ AFSTearDownFcbExtents( IN AFSFcb *Fcb,
 
                     InterlockedExchangeAdd( &Fcb->Specific.File.ExtentLength, -((LONG)(pEntry->Size/1024)));
 
-                    RemoveEntryList( le);
+                    for (ULONG i = 0; i < AFS_NUM_EXTENT_LISTS; i ++)
+                    {
+                        if (NULL != pEntry->Lists[i].Flink && !IsListEmpty(&pEntry->Lists[i]))
+                        {
+                            RemoveEntryList( &pEntry->Lists[i] );
+                        }
+                    }
 
                     AFSExFreePool( pEntry);