diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.html b/ui/src/app/metadata/configuration/container/metadata-options.component.html
index 99b512d3f..195f09433 100644
--- a/ui/src/app/metadata/configuration/container/metadata-options.component.html
+++ b/ui/src/app/metadata/configuration/container/metadata-options.component.html
@@ -8,10 +8,16 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
         [isEnabled]="isEnabled$ | async"
         [version]="model$ | async"
         [isCurrent]="true">
-        <button class="btn btn-outline btn-sm btn-danger align-self-start" (click)="deleteResolver(id)" *ngSwitchCase="'resolver'">
-            <translate-i18n key="action.delete">Delete</translate-i18n>
-            <i class="fa fa-trash ml-2"></i>
-        </button>
+        <div *ngSwitchCase="'resolver'"
+            class="align-self-start"
+            [ngbPopover]="(isEnabled$ | async) ? 'A metadata source must be disabled before it can be deleted.' : null"
+            [openDelay]="300" placement="left" triggers="mouseenter:mouseleave">
+            <button class="btn btn-outline btn-sm btn-danger align-self-start" (click)="deleteResolver(id, enabled)"
+                 [disabled]="(isEnabled$ | async)">
+                <translate-i18n key="action.delete">Delete</translate-i18n>
+                <i class="fa fa-trash ml-2"></i>
+            </button>
+        </div>
     </metadata-header>
     <div class="px-3 my-3 d-flex justify-content-between" id="navigation">
         <div>
diff --git a/ui/src/app/metadata/manager/component/resolvers-list.component.html b/ui/src/app/metadata/manager/component/resolvers-list.component.html
index 5c2de4b90..873ea754a 100644
--- a/ui/src/app/metadata/manager/component/resolvers-list.component.html
+++ b/ui/src/app/metadata/manager/component/resolvers-list.component.html
@@ -51,11 +51,13 @@
                         </span>
                     </ng-container>
                 </td>
-                <td class="text-right">
+                <td class="text-right" [ngbPopover]="resolver.enabled ? 'A metadata source must be disabled before it can be deleted.' : null"
+                    [openDelay]="300" triggers="mouseenter:mouseleave" placement="left">
                     <button class="btn btn-outline btn-sm btn-danger" (click)="delete.emit({
                         entity: resolver,
                         draft: resolver.isDraft()
-                    })">
+                    })"
+                    [disabled]="resolver.enabled">
                         <span class="sr-only">Delete</span>
                         <i class="fa fa-trash"></i>
                     </button>
diff --git a/ui/src/app/metadata/manager/manager.module.ts b/ui/src/app/metadata/manager/manager.module.ts
index afccc2c96..ff29ff372 100644
--- a/ui/src/app/metadata/manager/manager.module.ts
+++ b/ui/src/app/metadata/manager/manager.module.ts
@@ -3,7 +3,7 @@ import { HttpClientModule } from '@angular/common/http';
 import { RouterModule } from '@angular/router';
 import { CommonModule } from '@angular/common';
 import { ReactiveFormsModule } from '@angular/forms';
-import { NgbPaginationModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgbPaginationModule, NgbModalModule, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap';
 import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
@@ -39,6 +39,7 @@ import { ResolversListComponent } from './component/resolvers-list.component';
         RouterModule,
         NgbModalModule,
         NgbDropdownModule,
+        NgbPopoverModule,
         HttpClientModule,
         SharedModule,
         I18nModule,
diff --git a/ui/src/app/metadata/resolver/action/draft.action.ts b/ui/src/app/metadata/resolver/action/draft.action.ts
index db86148a3..c64c370df 100644
--- a/ui/src/app/metadata/resolver/action/draft.action.ts
+++ b/ui/src/app/metadata/resolver/action/draft.action.ts
@@ -84,7 +84,7 @@ export class RemoveDraftRequest implements Action {
 export class RemoveDraftSuccess implements Action {
     readonly type = DraftActionTypes.REMOVE_DRAFT_SUCCESS;
 
-    constructor(public payload: MetadataResolver) { }
+    constructor(public payload: string) { }
 }
 
 export class RemoveDraftFail implements Action {
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 07f2d4d24..707573dd5 100644
--- a/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts
+++ b/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts
@@ -109,15 +109,14 @@ export class DraftCollectionEffects {
             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))
+                map(p => new actions.RemoveDraftSuccess(val))
             );
         })
     );
     @Effect()
     removeDraftSuccessReload$ = this.actions$.pipe(
-        ofType<actions.RemoveDraftRequest>(DraftActionTypes.REMOVE_DRAFT),
-        map(getPayload),
-        map(provider => new actions.LoadDraftRequest())
+        ofType<actions.RemoveDraftSuccess>(DraftActionTypes.REMOVE_DRAFT_SUCCESS),
+        map(action => new actions.LoadDraftRequest())
     );
 
     constructor(
diff --git a/ui/src/app/metadata/resolver/reducer/draft.reducer.ts b/ui/src/app/metadata/resolver/reducer/draft.reducer.ts
index d3e723f0d..0cf30d153 100644
--- a/ui/src/app/metadata/resolver/reducer/draft.reducer.ts
+++ b/ui/src/app/metadata/resolver/reducer/draft.reducer.ts
@@ -17,8 +17,9 @@ export const initialState: DraftState = adapter.getInitialState({
 
 export function reducer(state = initialState, action: DraftActionsUnion): DraftState {
     switch (action.type) {
+
         case DraftActionTypes.LOAD_DRAFT_SUCCESS: {
-            return adapter.addMany(action.payload, {
+            return adapter.setAll(action.payload, {
                 ...state,
                 selectedDraftId: state.selectedDraftId,
             });
@@ -29,7 +30,7 @@ export function reducer(state = initialState, action: DraftActionsUnion): DraftS
         }
 
         case DraftActionTypes.REMOVE_DRAFT_SUCCESS: {
-            return adapter.removeOne(action.payload.id, state);
+            return adapter.removeOne(action.payload, state);
         }
 
         case DraftActionTypes.SELECT_SUCCESS: {