diff --git a/libs/common/src/lib/interfaces/activities.interface.ts b/libs/common/src/lib/interfaces/activities.interface.ts
index 8c88cc2cf..b9e64984b 100644
--- a/libs/common/src/lib/interfaces/activities.interface.ts
+++ b/libs/common/src/lib/interfaces/activities.interface.ts
@@ -8,7 +8,7 @@ export interface Activity extends Order {
   error?: ActivityError;
   feeInAssetProfileCurrency: number;
   feeInBaseCurrency: number;
-  SymbolProfile?: EnhancedSymbolProfile;
+  SymbolProfile: EnhancedSymbolProfile;
   tagIds?: string[];
   tags?: Tag[];
   unitPriceInAssetProfileCurrency: number;
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts
index e53f37872..4b43d5333 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts
@@ -132,7 +132,7 @@ export class GfActivitiesTableComponent
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
-  public displayedColumns = [];
+  public displayedColumns: string[] = [];
   public endOfToday = endOfToday();
   public hasDrafts = false;
   public hasErrors = false;
diff --git a/libs/ui/src/lib/mocks/holdings.ts b/libs/ui/src/lib/mocks/holdings.ts
index 0f30b3e6f..d162d7049 100644
--- a/libs/ui/src/lib/mocks/holdings.ts
+++ b/libs/ui/src/lib/mocks/holdings.ts
@@ -162,7 +162,7 @@ export const holdings: PortfolioPosition[] = [
     symbol: 'bitcoin',
     tags: [],
     transactionCount: 1,
-    url: null,
+    url: undefined,
     valueInBaseCurrency: 54666.7898248
   },
   {
diff --git a/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.ts b/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.ts
index 8691dc998..9ca91d111 100644
--- a/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.ts
+++ b/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.ts
@@ -24,5 +24,5 @@ export class GfNoTransactionsInfoComponent {
   @HostBinding('class.has-border') @Input() hasBorder = true;
 
   public routerLinkPortfolioActivities =
-    internalRoutes.portfolio.subRoutes.activities.routerLink;
+    internalRoutes.portfolio.subRoutes?.activities.routerLink;
 }
diff --git a/libs/ui/src/lib/notifications/prompt-dialog/prompt-dialog.component.ts b/libs/ui/src/lib/notifications/prompt-dialog/prompt-dialog.component.ts
index 6ea68d863..abfc7e154 100644
--- a/libs/ui/src/lib/notifications/prompt-dialog/prompt-dialog.component.ts
+++ b/libs/ui/src/lib/notifications/prompt-dialog/prompt-dialog.component.ts
@@ -27,11 +27,11 @@ export class GfPromptDialogComponent {
   public constructor(public dialogRef: MatDialogRef<GfPromptDialogComponent>) {}
 
   public initialize(aParams: {
-    confirmLabel?: string;
-    defaultValue?: string;
-    discardLabel?: string;
+    confirmLabel: string;
+    defaultValue: string;
+    discardLabel: string;
     title: string;
-    valueLabel?: string;
+    valueLabel: string;
   }) {
     this.confirmLabel = aParams.confirmLabel;
     this.defaultValue = aParams.defaultValue;
diff --git a/libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.ts b/libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.ts
index afbe5af4e..b83a43aa8 100644
--- a/libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.ts
+++ b/libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.ts
@@ -70,10 +70,10 @@ export class GfPortfolioFilterFormComponent
     private formBuilder: FormBuilder
   ) {
     this.filterForm = this.formBuilder.group({
-      account: new FormControl<string>(null),
-      assetClass: new FormControl<string>(null),
-      holding: new FormControl<PortfolioPosition>(null),
-      tag: new FormControl<string>(null)
+      account: new FormControl<string | null>(null),
+      assetClass: new FormControl<string | null>(null),
+      holding: new FormControl<PortfolioPosition | null>(null),
+      tag: new FormControl<string | null>(null)
     });
   }
 
diff --git a/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts b/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts
index fb11897eb..9f2287260 100644
--- a/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts
+++ b/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts
@@ -135,7 +135,7 @@ export class GfPortfolioProportionChartComponent
 
             if (
               chartData[this.data[symbol][this.keys[0]].toUpperCase()]
-                .subCategory[this.data[symbol][this.keys[1]]]
+                ?.subCategory?.[this.data[symbol][this.keys[1]]]
             ) {
               chartData[
                 this.data[symbol][this.keys[0]].toUpperCase()
diff --git a/libs/ui/src/lib/services/admin.service.ts b/libs/ui/src/lib/services/admin.service.ts
index 145f134e3..a10798401 100644
--- a/libs/ui/src/lib/services/admin.service.ts
+++ b/libs/ui/src/lib/services/admin.service.ts
@@ -132,7 +132,7 @@ export class AdminService {
   public fetchJobs({ status }: { status?: JobStatus[] }) {
     let params = new HttpParams();
 
-    if (status?.length > 0) {
+    if (status && status.length > 0) {
       params = params.append('status', status.join(','));
     }
 
@@ -158,8 +158,8 @@ export class AdminService {
   }) {
     let params = new HttpParams();
 
-    params = params.append('skip', skip);
-    params = params.append('take', take);
+    if (skip) params = params.append('skip', skip);
+    if (take) params = params.append('take', take);
 
     return this.http.get<AdminUsersResponse>('/api/v1/admin/user', { params });
   }
diff --git a/libs/ui/src/lib/services/data.service.ts b/libs/ui/src/lib/services/data.service.ts
index 37443cd20..d8c524f4e 100644
--- a/libs/ui/src/lib/services/data.service.ts
+++ b/libs/ui/src/lib/services/data.service.ts
@@ -89,7 +89,7 @@ export class DataService {
   public buildFiltersAsQueryParams({ filters }: { filters?: Filter[] }) {
     let params = new HttpParams();
 
-    if (filters?.length > 0) {
+    if (filters && filters.length > 0) {
       const {
         ACCOUNT: filtersByAccount,
         ASSET_CLASS: filtersByAssetClass,
diff --git a/libs/ui/src/lib/shared/abstract-mat-form-field.ts b/libs/ui/src/lib/shared/abstract-mat-form-field.ts
index 628f0a659..ce8c447a5 100644
--- a/libs/ui/src/lib/shared/abstract-mat-form-field.ts
+++ b/libs/ui/src/lib/shared/abstract-mat-form-field.ts
@@ -137,7 +137,7 @@ export abstract class AbstractMatFormField<T>
 
   public ngDoCheck() {
     if (this.ngControl) {
-      this.errorState = this.ngControl.invalid && this.ngControl.touched;
+      this.errorState = !!(this.ngControl.invalid && this.ngControl.touched);
       this.stateChanges.next();
     }
   }