diff --git a/apps/api/src/app/endpoints/watchlist/watchlist.service.ts b/apps/api/src/app/endpoints/watchlist/watchlist.service.ts
index c086c5f0e..fdb9dd97a 100644
--- a/apps/api/src/app/endpoints/watchlist/watchlist.service.ts
+++ b/apps/api/src/app/endpoints/watchlist/watchlist.service.ts
@@ -74,6 +74,6 @@ export class WatchlistService {
       where: { id: userId }
     });
 
-    return user?.watchlist ?? [];
+    return user.watchlist ?? [];
   }
 }
diff --git a/apps/client/src/app/components/home-watchlist/create-watchlist-item-dialog/create-watchlist-item-dialog.html b/apps/client/src/app/components/home-watchlist/create-watchlist-item-dialog/create-watchlist-item-dialog.html
index 3773455b3..d878dc5ff 100644
--- a/apps/client/src/app/components/home-watchlist/create-watchlist-item-dialog/create-watchlist-item-dialog.html
+++ b/apps/client/src/app/components/home-watchlist/create-watchlist-item-dialog/create-watchlist-item-dialog.html
@@ -6,12 +6,10 @@
 >
   <h1 i18n mat-dialog-title>Add Asset</h1>
   <div class="flex-grow-1 py-3" mat-dialog-content>
-    <div>
-      <mat-form-field appearance="outline" class="w-100">
-        <mat-label i18n>Name, symbol or ISIN</mat-label>
-        <gf-symbol-autocomplete formControlName="searchSymbol" />
-      </mat-form-field>
-    </div>
+    <mat-form-field appearance="outline" class="w-100">
+      <mat-label i18n>Name, symbol or ISIN</mat-label>
+      <gf-symbol-autocomplete formControlName="searchSymbol" />
+    </mat-form-field>
   </div>
   <div class="d-flex justify-content-end" mat-dialog-actions>
     <button i18n mat-button type="button" (click)="onCancel()">Cancel</button>
diff --git a/apps/client/src/app/components/home-watchlist/home-watchlist.component.ts b/apps/client/src/app/components/home-watchlist/home-watchlist.component.ts
index 2895b361a..14a9d0ddb 100644
--- a/apps/client/src/app/components/home-watchlist/home-watchlist.component.ts
+++ b/apps/client/src/app/components/home-watchlist/home-watchlist.component.ts
@@ -81,11 +81,11 @@ export class HomeWatchlistComponent implements OnDestroy, OnInit {
       .fetchWatchlist()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(({ watchlist }) => {
-        this.watchlist = watchlist.map((item) => ({
-          dataSource: item.dataSource,
-          symbol: item.symbol,
-          name: item.symbol,
+        this.watchlist = watchlist.map(({ dataSource, symbol }) => ({
+          dataSource,
+          symbol,
           marketCondition: null,
+          name: symbol,
           performances: null,
           trend200d: 'UNKNOWN',
           trend50d: 'UNKNOWN'
@@ -123,6 +123,7 @@ export class HomeWatchlistComponent implements OnDestroy, OnInit {
                   next: () => this.loadWatchlistData()
                 });
             }
+
             this.router.navigate(['.'], { relativeTo: this.route });
           });
       });