diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/ClientConnection.cpp b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/ClientConnection.cpp
index 5b3fa24916..e0329b438f 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/ClientConnection.cpp
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/ClientConnection.cpp
@@ -601,6 +601,13 @@ ClientConnection::VisitMountRequest(MountRequest* request)
 		reply.sharePermissions = sharePermissions.GetPermissions();
 		reply.volumeID = volume->GetID();
 	}
+
+	// make sure, the volume is removed on error
+	if (result != B_OK && volume) {
+		AutoLocker<VolumeMap> volumeMapLocker(fVolumes);
+		volume->MarkRemoved();
+	}
+
 	securityContextLocker.Unlock();
 	managerLocker.Unlock();