diff --git a/src/app/core/data/entity-type.service.ts b/src/app/core/data/entity-type.service.ts
index 9971694f4b..39d45dc0b3 100644
--- a/src/app/core/data/entity-type.service.ts
+++ b/src/app/core/data/entity-type.service.ts
@@ -88,10 +88,10 @@ export class EntityTypeService extends DataService<ItemType> {
    * @param label
    */
   getEntityTypeByLabel(label: string): Observable<RemoteData<ItemType>> {
-    let endPoint;
-    this.halService.getEndpoint(this.linkPath).pipe(take(1)).subscribe((result) => {
-      endPoint = result;
-    });
-    return this.findByHref(endPoint + '/label/' + label);
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      take(1),
+      switchMap((endPoint: string) =>
+        this.findByHref(endPoint + '/label/' + label))
+    );
   }
 }