diff --git a/libs/common/src/lib/interfaces/lookup-item.interface.ts b/libs/common/src/lib/interfaces/lookup-item.interface.ts
index fa91ed690..6cedeca09 100644
--- a/libs/common/src/lib/interfaces/lookup-item.interface.ts
+++ b/libs/common/src/lib/interfaces/lookup-item.interface.ts
@@ -7,7 +7,7 @@ export interface LookupItem {
   assetSubClass: AssetSubClass;
   currency: string;
   dataProviderInfo: DataProviderInfo;
-  dataSource: DataSource;
+  dataSource: DataSource | null;
   name: string;
   symbol: string;
 }
diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.ts b/libs/ui/src/lib/holdings-table/holdings-table.component.ts
index bea555a0b..0f19e1321 100644
--- a/libs/ui/src/lib/holdings-table/holdings-table.component.ts
+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.ts
@@ -106,6 +106,7 @@ export class GfHoldingsTableComponent {
   protected canShowDetails(holding: PortfolioPosition): boolean {
     return (
       this.hasPermissionToOpenDetails() &&
+      !!holding.assetSubClass &&
       !this.ignoreAssetSubClasses.includes(holding.assetSubClass)
     );
   }
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/portfolio-proportion-chart/portfolio-proportion-chart.component.ts b/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts
index 7d0203e9c..1cd9f48e5 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
@@ -140,16 +140,18 @@ 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]]]
             ) {
+              // @ts-ignore
               chartData[
                 this.data[symbol][this.keys[0]].toUpperCase()
               ].subCategory[this.data[symbol][this.keys[1]]].value = chartData[
                 this.data[symbol][this.keys[0]].toUpperCase()
-              ].subCategory[this.data[symbol][this.keys[1]]].value.plus(
+              ].subCategory?.[this.data[symbol][this.keys[1]]].value.plus(
                 this.data[symbol].value || 0
               );
             } else {
+              // @ts-ignore
               chartData[
                 this.data[symbol][this.keys[0]].toUpperCase()
               ].subCategory[this.data[symbol][this.keys[1]] ?? UNKNOWN_KEY] = {
@@ -278,12 +280,14 @@ export class GfPortfolioProportionChartComponent
 
       Object.keys(item.subCategory ?? {}).forEach((subCategory) => {
         if (item.name === UNKNOWN_KEY) {
+          // @ts-ignore
           backgroundColorSubCategory.push(item.color);
         } else {
           backgroundColorSubCategory.push(
             Color(item.color).lighten(lightnessRatio).hex()
           );
         }
+        // @ts-ignore
         dataSubCategory.push(item.subCategory[subCategory].value.toNumber());
         labelSubCategory.push(subCategory);
 
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();
     }
   }
diff --git a/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts b/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts
index c74e8a077..e17044c3f 100644
--- a/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts
+++ b/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts
@@ -185,7 +185,7 @@ export class GfSymbolAutocompleteComponent
   public ngDoCheck() {
     if (this.ngControl) {
       this.validateRequired();
-      this.errorState = this.ngControl.invalid && this.ngControl.touched;
+      this.errorState = !!(this.ngControl.invalid && this.ngControl.touched);
       this.stateChanges.next();
     }
   }
@@ -225,7 +225,7 @@ export class GfSymbolAutocompleteComponent
       ? !super.value?.dataSource || !super.value?.symbol
       : false;
     if (requiredCheck) {
-      this.ngControl.control.setErrors({ invalidData: true });
+      this.ngControl.control?.setErrors({ invalidData: true });
     }
   }
 }
diff --git a/libs/ui/src/lib/tags-selector/tags-selector.component.ts b/libs/ui/src/lib/tags-selector/tags-selector.component.ts
index 7f1a8805e..6ed742019 100644
--- a/libs/ui/src/lib/tags-selector/tags-selector.component.ts
+++ b/libs/ui/src/lib/tags-selector/tags-selector.component.ts
@@ -77,7 +77,7 @@ export class GfTagsSelectorComponent
     this.tagInputControl.valueChanges
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe((value) => {
-        this.filteredOptions.next(this.filterTags(value));
+        this.filteredOptions.next(this.filterTags(value ?? ''));
       });
 
     addIcons({ addCircleOutline, closeOutline });
@@ -100,21 +100,23 @@ export class GfTagsSelectorComponent
 
     if (!tag && this.hasPermissionToCreateTag) {
       tag = {
-        id: undefined,
+        id: '',
         name: event.option.value as string,
         userId: null
       };
     }
 
-    this.tagsSelected.update((tags) => {
-      return [...(tags ?? []), tag];
-    });
+    if (tag) {
+      this.tagsSelected.update((tags) => {
+        return [...(tags ?? []), tag];
+      });
+    }
 
     const newTags = this.tagsSelected();
     this.onChange(newTags);
     this.onTouched();
     this.tagInput.nativeElement.value = '';
-    this.tagInputControl.setValue(undefined);
+    this.tagInputControl.setValue(null);
   }
 
   public onRemoveTag(tag: Tag) {
diff --git a/libs/ui/src/lib/toggle/toggle.component.ts b/libs/ui/src/lib/toggle/toggle.component.ts
index be460f7fa..fb238556d 100644
--- a/libs/ui/src/lib/toggle/toggle.component.ts
+++ b/libs/ui/src/lib/toggle/toggle.component.ts
@@ -26,13 +26,15 @@ export class GfToggleComponent implements OnChanges {
 
   @Output() valueChange = new EventEmitter<Pick<ToggleOption, 'value'>>();
 
-  public optionFormControl = new FormControl<string>(undefined);
+  public optionFormControl = new FormControl<string | null>(null);
 
   public ngOnChanges() {
     this.optionFormControl.setValue(this.defaultValue);
   }
 
   public onValueChange() {
-    this.valueChange.emit({ value: this.optionFormControl.value });
+    if (this.optionFormControl.value !== null) {
+      this.valueChange.emit({ value: this.optionFormControl.value });
+    }
   }
 }
diff --git a/libs/ui/tsconfig.json b/libs/ui/tsconfig.json
index 04f4630bc..51348a52a 100644
--- a/libs/ui/tsconfig.json
+++ b/libs/ui/tsconfig.json
@@ -19,6 +19,7 @@
     "target": "es2020",
     // TODO: Remove once solved in tsconfig.base.json
     "strict": false,
+    "strictNullChecks": true,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true
   },