diff --git a/src/add-ons/kernel/file_systems/packagefs/NameIndex.cpp b/src/add-ons/kernel/file_systems/packagefs/NameIndex.cpp
index 6172195e6d..c142215c2c 100644
--- a/src/add-ons/kernel/file_systems/packagefs/NameIndex.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/NameIndex.cpp
@@ -130,7 +130,7 @@ NameIndex::NameIndex()
 
 NameIndex::~NameIndex()
 {
-	if (fVolume != NULL)
+	if (IsListening())
 		fVolume->RemoveNodeListener(this);
 
 	delete fEntries;