diff --git a/src-ui/src/app/components/manage/management-list/management-list.component.ts b/src-ui/src/app/components/manage/management-list/management-list.component.ts
index 6b235123a..60c524c28 100644
--- a/src-ui/src/app/components/manage/management-list/management-list.component.ts
+++ b/src-ui/src/app/components/manage/management-list/management-list.component.ts
@@ -146,7 +146,7 @@ export abstract class ManagementListComponent<T extends MatchingModel>
   }
 
   public getOriginalObject(object: T): T {
-    return this.unfilteredData.find((d) => d.id == object.id)
+    return this.unfilteredData.find((d) => d?.id == object?.id) || object
   }
 
   reloadData(extraParams: { [key: string]: any } = null) {