diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index ced3e019ff..df8b82b076 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -5,7 +5,7 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { map } from 'rxjs/operators';
+import { map, take } from 'rxjs/operators';
 import { hasValue } from '../../../shared/empty.util';
 import { RestResponse } from '../../../core/cache/response.models';
 import { zip } from 'rxjs/internal/observable/zip';
@@ -70,7 +70,7 @@ export class MetadataRegistryComponent {
   }
 
   deleteSchemas() {
-    this.registryService.getSelectedMetadataSchemas().subscribe(
+    this.registryService.getSelectedMetadataSchemas().pipe(take(1)).subscribe(
       (schemas) => {
         const tasks$ = [];
         for (const schema of schemas) {
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index e1f6ae859c..9d35ae5ff7 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -8,9 +8,6 @@ import {
 import { FormGroup } from '@angular/forms';
 import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { FormService } from '../../../../shared/form/form.service';
-import { Store } from '@ngrx/store';
-import { AppState } from '../../../../app.reducer';
 import { take } from 'rxjs/operators';
 import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
 
@@ -73,11 +70,10 @@ export class MetadataSchemaFormComponent implements OnInit {
 
   @Output() submitForm: EventEmitter<any> = new EventEmitter();
 
-  constructor(private registryService: RegistryService, private formBuilderService: FormBuilderService, private formService: FormService, private store: Store<AppState>) {
+  constructor(private registryService: RegistryService, private formBuilderService: FormBuilderService) {
   }
 
   ngOnInit() {
-
     this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
     this.registryService.getActiveMetadataSchema().subscribe((schema) => {
       this.formGroup.patchValue({
@@ -95,7 +91,7 @@ export class MetadataSchemaFormComponent implements OnInit {
   }
 
   onSubmit() {
-    this.registryService.getActiveMetadataSchema().subscribe(
+    this.registryService.getActiveMetadataSchema().pipe(take(1)).subscribe(
       (schema) => {
         const values = {
           prefix: this.name.value,