diff --git a/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts b/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts
index 6db7c2ffe..41c21aae3 100644
--- a/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts
+++ b/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts
@@ -104,11 +104,15 @@ export class DraftCollectionEffects {
     removeDraft$ = this.actions$.pipe(
         ofType<actions.RemoveDraftRequest>(DraftActionTypes.REMOVE_DRAFT),
         map(getPayload),
-            switchMap(provider => this.draftService.find(provider.id, 'id').pipe(
+        switchMap(provider => {
+            let hasEntityId = !!provider.entityId;
+            let prop = hasEntityId ? 'entityId' : 'id';
+            let val = hasEntityId ? provider.entityId : provider.id;
+            return this.draftService.find(val, prop).pipe(
                 switchMap(selected => this.draftService.remove(selected)),
                 map(p => new actions.RemoveDraftSuccess(p))
-            )
-        )
+            );
+        })
     );
     @Effect()
     removeDraftSuccessReload$ = this.actions$.pipe(