diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9baa1b3f..8462f5ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed the default value of the data source attribute
 - Upgraded `@storybook` dependencies
 
+### Fixed
+
+- Fixed an issue in the create or edit transaction dialog
+
 ### Todo
 
 - Apply data migration (`yarn prisma migrate deploy`)
diff --git a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts
index 52c92449..6f5dfe6b 100644
--- a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts
+++ b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts
@@ -37,13 +37,14 @@ export class CreateOrUpdateTransactionDialog implements OnDestroy {
 
   public currencies: Currency[] = [];
   public currentMarketPrice = null;
-  public filteredLookupItems: Observable<LookupItem[]>;
+  public filteredLookupItems: LookupItem[];
+  public filteredLookupItemsObservable: Observable<LookupItem[]>;
   public isLoading = false;
   public platforms: { id: string; name: string }[];
   public searchSymbolCtrl = new FormControl(
     {
       dataSource: this.data.transaction.dataSource,
-      name: this.data.transaction.symbol
+      symbol: this.data.transaction.symbol
     },
     Validators.required
   );
@@ -63,18 +64,26 @@ export class CreateOrUpdateTransactionDialog implements OnDestroy {
     this.currencies = currencies;
     this.platforms = platforms;
 
-    this.filteredLookupItems = this.searchSymbolCtrl.valueChanges.pipe(
-      startWith(''),
-      debounceTime(400),
-      distinctUntilChanged(),
-      switchMap((query: string) => {
-        if (isString(query)) {
-          return this.dataService.fetchSymbols(query);
-        }
+    this.filteredLookupItemsObservable =
+      this.searchSymbolCtrl.valueChanges.pipe(
+        startWith(''),
+        debounceTime(400),
+        distinctUntilChanged(),
+        switchMap((query: string) => {
+          if (isString(query)) {
+            const filteredLookupItemsObservable =
+              this.dataService.fetchSymbols(query);
 
-        return [];
-      })
-    );
+            filteredLookupItemsObservable.subscribe((filteredLookupItems) => {
+              this.filteredLookupItems = filteredLookupItems;
+            });
+
+            return filteredLookupItemsObservable;
+          }
+
+          return [];
+        })
+      );
 
     if (this.data.transaction.symbol) {
       this.dataService
@@ -96,17 +105,22 @@ export class CreateOrUpdateTransactionDialog implements OnDestroy {
   }
 
   public displayFn(aLookupItem: LookupItem) {
-    return aLookupItem?.name ?? '';
+    return aLookupItem?.symbol ?? '';
   }
 
   public onBlurSymbol() {
-    this.data.transaction.currency = null;
-    this.data.transaction.dataSource = null;
+    const currentLookupItem = this.filteredLookupItems.find((lookupItem) => {
+      return lookupItem.symbol === this.data.transaction.symbol;
+    });
 
-    if (this.autocomplete.isOpen) {
-      this.searchSymbolCtrl.setErrors({ incorrect: true });
+    if (currentLookupItem) {
+      this.updateSymbol(currentLookupItem.symbol);
     } else {
-      this.data.transaction.unitPrice = null;
+      this.searchSymbolCtrl.setErrors({ incorrect: true });
+
+      this.data.transaction.currency = null;
+      this.data.transaction.dataSource = null;
+      this.data.transaction.symbol = null;
     }
 
     this.changeDetectorRef.markForCheck();
diff --git a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html
index 8af61bc3..bd81c1a1 100644
--- a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html
+++ b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html
@@ -38,7 +38,7 @@
         >
           <ng-container>
             <mat-option
-              *ngFor="let lookupItem of filteredLookupItems | async"
+              *ngFor="let lookupItem of filteredLookupItemsObservable | async"
               class="autocomplete"
               [value]="lookupItem"
             >