diff --git a/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp b/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp
index caf4037ac0..fd5e57b3b5 100644
--- a/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp
@@ -46,7 +46,9 @@ FileSystem::FileSystem(const MountConfiguration& configuration)
 
 FileSystem::~FileSystem()
 {
-	NFSServer()->RemoveFileSystem(this);
+	NFS4Server* server = reinterpret_cast<NFS4Server*>(fServer->PrivateData());
+	if (server != NULL)
+		server->RemoveFileSystem(this);
 
 	mutex_destroy(&fDelegationLock);
 	mutex_destroy(&fOpenLock);