diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts
index 63e163b78..b29306f1b 100644
--- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts
+++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts
@@ -7,6 +7,7 @@ import { Observable, of as observableOf, Subject } from 'rxjs';
 import { debounceTime, distinctUntilChanged, map, mergeMap, startWith, tap } from 'rxjs/operators';
 import { AutoCompleteGroup } from '../auto-complete-group';
 import { MultipleAutoCompleteConfiguration } from './multiple-auto-complete-configuration';
+import { switchMap } from 'rxjs/internal/operators/switchMap';
 
 @Component({
 	selector: 'app-multiple-auto-complete',
@@ -189,7 +190,7 @@ export class MultipleAutoCompleteComponent implements OnInit, MatFormFieldContro
 				debounceTime(this.requestDelay),
 				distinctUntilChanged(),
 				tap(() => { this.loading = true; }),
-				mergeMap(query => {
+				switchMap(query => {
 					// If its a valid object, a selection just made and the object is set as the value of the form control. That means we should fire an extra request to the server.
 					if (this._isValidObject(query)) { return observableOf([]); }
 
diff --git a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts
index 17b1d85bf..d3b77a365 100644
--- a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts
+++ b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts
@@ -7,6 +7,7 @@ import { Observable, of as observableOf, Subject } from 'rxjs';
 import { debounceTime, distinctUntilChanged, map, mergeMap, startWith, tap } from 'rxjs/operators';
 import { AutoCompleteGroup } from '../auto-complete-group';
 import { SingleAutoCompleteConfiguration } from './single-auto-complete-configuration';
+import { switchMap } from 'rxjs/internal/operators/switchMap';
 
 
 @Component({
@@ -167,7 +168,7 @@ export class SingleAutoCompleteComponent implements OnInit, MatFormFieldControl<
 				debounceTime(this.requestDelay),
 				distinctUntilChanged(),
 				tap(() => { this.loading = true; }),
-				mergeMap(query => {
+				switchMap(query => {
 					// If its a valid object, a selection just made and the object is set as the value of the form control. That means we should fire an extra request to the server.
 					if (this._isValidObject(query)) { return observableOf([]); }