diff --git a/core/src/NetworkObject.h b/core/src/NetworkObject.h
index c42c86a14..0a5fff2fc 100644
--- a/core/src/NetworkObject.h
+++ b/core/src/NetworkObject.h
@@ -43,6 +43,7 @@ class VEYON_CORE_EXPORT NetworkObject
 		None,
 		Root,
 		Location,
+		RemoteSessionServer,
 		Host,
 		Label,
 		TypeCount
diff --git a/core/src/NetworkObjectDirectory.cpp b/core/src/NetworkObjectDirectory.cpp
index 9f6a6d8d5..571141d7d 100644
--- a/core/src/NetworkObjectDirectory.cpp
+++ b/core/src/NetworkObjectDirectory.cpp
@@ -59,7 +59,8 @@ void NetworkObjectDirectory::setUpdateInterval( int interval )
 const NetworkObjectList& NetworkObjectDirectory::objects( const NetworkObject& parent ) const
 {
 	if( parent.type() == NetworkObject::Type::Root ||
-			parent.type() == NetworkObject::Type::Location )
+		parent.type() == NetworkObject::Type::Location ||
+		parent.type() == NetworkObject::Type::RemoteSessionServer )
 	{
 		const auto it = m_objects.constFind( parent.modelId() );
 		if( it != m_objects.end() )
@@ -283,7 +284,8 @@ void NetworkObjectDirectory::addOrUpdateObject( const NetworkObject& networkObje
 		Q_EMIT objectsAboutToBeInserted( parent, objectList.count(), 1 );
 
 		objectList.append( completeNetworkObject );
-		if( completeNetworkObject.type() == NetworkObject::Type::Location )
+		if( completeNetworkObject.type() == NetworkObject::Type::Location ||
+			completeNetworkObject.type() == NetworkObject::Type::RemoteSessionServer )
 		{
 			m_objects[completeNetworkObject.modelId()] = {};
 		}
@@ -314,7 +316,8 @@ void NetworkObjectDirectory::removeObjects( const NetworkObject& parent, const N
 	{
 		if( removeObjectFilter( *it ) )
 		{
-			if( it->type() == NetworkObject::Type::Location )
+			if( it->type() == NetworkObject::Type::Location ||
+				it->type() == NetworkObject::Type::RemoteSessionServer )
 			{
 				objectsToRemove.append( it->modelId() );
 			}
diff --git a/master/src/ComputerManager.cpp b/master/src/ComputerManager.cpp
index 1d16a3dd6..0e7c2f01f 100644
--- a/master/src/ComputerManager.cpp
+++ b/master/src/ComputerManager.cpp
@@ -381,6 +381,7 @@ ComputerList ComputerManager::selectedComputers( const QModelIndex& parent )
 		switch( objectType )
 		{
 		case NetworkObject::Type::Location:
+		case NetworkObject::Type::RemoteSessionServer:
 			computers += selectedComputers( entryIndex );
 			break;
 		case NetworkObject::Type::Host: