diff --git a/libs/ui/src/lib/currency-selector/currency-selector.component.html b/libs/ui/src/lib/currency-selector/currency-selector.component.html
index 29aef16f2..5b445bfb8 100644
--- a/libs/ui/src/lib/currency-selector/currency-selector.component.html
+++ b/libs/ui/src/lib/currency-selector/currency-selector.component.html
@@ -15,7 +15,7 @@
     <mat-option
       *ngFor="let currencyItem of filteredCurrencies"
       class="line-height-1"
-      [value]="currencyItem.value"
+      [value]="currencyItem"
     >
       {{ currencyItem.label }}
     </mat-option>
diff --git a/libs/ui/src/lib/currency-selector/currency-selector.component.ts b/libs/ui/src/lib/currency-selector/currency-selector.component.ts
index 8c05600ce..4b5892515 100644
--- a/libs/ui/src/lib/currency-selector/currency-selector.component.ts
+++ b/libs/ui/src/lib/currency-selector/currency-selector.component.ts
@@ -16,13 +16,8 @@ import {
 } from '@angular/material/autocomplete';
 import { MatFormFieldControl } from '@angular/material/form-field';
 import { MatInput } from '@angular/material/input';
-import { Subject, of, tap } from 'rxjs';
-import {
-  debounceTime,
-  distinctUntilChanged,
-  switchMap,
-  takeUntil
-} from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { map, startWith, takeUntil } from 'rxjs/operators';
 import { Currency } from '@ghostfolio/common/interfaces/currency.interface';
 import { AbstractMatFormField } from '../symbol-autocomplete/abstract-mat-form-field';
 
@@ -75,41 +70,44 @@ export class CurrencySelectorComponent
       this.control.disable();
     }
 
+    this.control.valueChanges
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe(() => {
+        if (super.value?.value) {
+          super.value.value = null;
+        }
+      });
+
     this.control.valueChanges
       .pipe(
-        debounceTime(400),
-        distinctUntilChanged(),
         takeUntil(this.unsubscribeSubject),
-        tap(() => {
-          this.isLoading = true;
-
-          this.changeDetectorRef.markForCheck();
-        }),
-        switchMap((query) => {
-          return of(
-            this.currencies.filter((currency) =>
-              currency.label.toLowerCase().includes(query?.toLowerCase() || '')
-            ) || []
-          );
-        })
+        startWith(''),
+        map((value) => (value ? this.filter(value) : this.currencies.slice()))
       )
-      .subscribe((filteredCurrencies: Currency[]) => {
-        this.filteredCurrencies = filteredCurrencies;
-
-        this.isLoading = false;
-
-        this.changeDetectorRef.markForCheck();
+      .subscribe((val) => {
+        this.filteredCurrencies = val;
       });
   }
 
-  public displayFn(currency: string) {
-    return currency;
+  public displayFn(currency: Currency) {
+    return currency?.label ?? '';
   }
 
   public get empty() {
     return this.input?.empty;
   }
 
+  private filter(value: Currency | string) {
+    const filterValue =
+      typeof value === 'string'
+        ? value?.toLowerCase()
+        : value?.value.toLowerCase();
+
+    return this.currencies.filter((currency) =>
+      currency.value.toLowerCase().startsWith(filterValue)
+    );
+  }
+
   public focus() {
     this.input.focus();
   }
@@ -124,7 +122,8 @@ export class CurrencySelectorComponent
 
   public onUpdateCurrency(event: MatAutocompleteSelectedEvent) {
     super.value = {
-      value: event.option.value
+      label: event.option.value.label,
+      value: event.option.value.value
     } as Currency;
   }
 
@@ -142,11 +141,9 @@ export class CurrencySelectorComponent
 
   private validateRequired() {
     const requiredCheck = super.required
-      ? !super.value?.value &&
-        !this.currencies
-          .map((currency) => currency.value)
-          .includes(super.value.value)
+      ? !super.value.label || !super.value.value
       : false;
+
     if (requiredCheck) {
       this.ngControl.control.setErrors({ invalidData: true });
     }