diff --git a/ogWebconsole/src/app/components/groups/groups.component.ts b/ogWebconsole/src/app/components/groups/groups.component.ts
index 182814b..1f91bc7 100644
--- a/ogWebconsole/src/app/components/groups/groups.component.ts
+++ b/ogWebconsole/src/app/components/groups/groups.component.ts
@@ -254,6 +254,7 @@ export class GroupsComponent implements OnInit, OnDestroy {
     level,
     expandable: !!node.children?.length,
     hasClients: node.hasClients,
+    remotePc: node.remotePc,
     ip: node.ip,
     '@id': node['@id'],
     networkSettings: node.networkSettings,
@@ -1386,7 +1387,7 @@ export class GroupsComponent implements OnInit, OnDestroy {
   }
 
   get classroomHasRemotePc(): boolean {
-    return this.selectedClients.data.some((c: any) => c.organizationalUnit?.remotePc === true);
+    return !!(this.selectedNode as any)?.remotePc;
   }
 
   syncUds(event: MouseEvent): void {
diff --git a/ogWebconsole/src/app/components/groups/model/model.ts b/ogWebconsole/src/app/components/groups/model/model.ts
index ec6c71f..e4af7ea 100644
--- a/ogWebconsole/src/app/components/groups/model/model.ts
+++ b/ogWebconsole/src/app/components/groups/model/model.ts
@@ -85,6 +85,7 @@ export interface FlatNode {
   level: number;
   expandable: boolean;
   hasClients?: boolean;
+  remotePc?: boolean;
   networkSettings?: Object;
   ip?: string;
   '@id'?: string;