diff --git a/src/add-ons/kernel/file_systems/nfs4/RPCServer.cpp b/src/add-ons/kernel/file_systems/nfs4/RPCServer.cpp
index 280be81a68..fed27887e6 100644
--- a/src/add-ons/kernel/file_systems/nfs4/RPCServer.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/RPCServer.cpp
@@ -304,15 +304,13 @@ ServerManager::Release(Server* serv)
 	if (node != NULL) {
 		node->fRefCount--;
 
-		if (node->fRefCount == 0)
+		if (node->fRefCount == 0) {
 			_Delete(node);
+			delete node->fServer;
+			delete node;
+		}
 	}
 	mutex_unlock(&fLock);
-
-	if (node != NULL) {
-		delete node->fServer;
-		delete node;
-	}
 }