diff --git a/packages/desktop-app/src/app/components/filter-menu/filter-menu.component.html b/packages/desktop-app/src/app/components/filter-menu/filter-menu.component.html
index 6edde97ac..a7adfb057 100644
--- a/packages/desktop-app/src/app/components/filter-menu/filter-menu.component.html
+++ b/packages/desktop-app/src/app/components/filter-menu/filter-menu.component.html
@@ -9,7 +9,7 @@
     <ng-container *ngIf="!categories || categories.length === 0">
       <ng-container *ngFor="let element of data">
         <ng-container *ngIf="element.show">
-          <mat-checkbox (click)="$event.stopPropagation();" (change)="element.value = $event.checked; updateValue($event, data, form);" checked="{{element.value ? 'checked' : ''}}"></mat-checkbox><span>{{element.name}}</span>
+          <mat-checkbox (click)="$event.stopPropagation();" (change)="element.value = $event.checked; updateValue($event, data, form);" [checked]="element.value"></mat-checkbox><span>{{element.name}}</span>
           <br>
         </ng-container>
       </ng-container>
@@ -19,7 +19,7 @@
         <small class="category">{{category}}</small><br>
         <ng-container *ngFor="let element of data">
           <ng-container *ngIf="element.show && element.category === category">
-            <mat-checkbox (click)="$event.stopPropagation();" (change)="element.value = $event.checked; updateValue($event, data, form);" checked="{{element.value ? 'checked' : ''}}"></mat-checkbox><span>{{element.name}}</span>
+            <mat-checkbox (click)="$event.stopPropagation();" (change)="element.value = $event.checked; updateValue($event, data, form);" [checked]="element.value"></mat-checkbox><span>{{element.name}}</span>
             <br>
           </ng-container>
         </ng-container>
diff --git a/packages/desktop-app/src/app/components/filter-menu/filter-menu.component.ts b/packages/desktop-app/src/app/components/filter-menu/filter-menu.component.ts
index d18cd50ad..e381e301e 100644
--- a/packages/desktop-app/src/app/components/filter-menu/filter-menu.component.ts
+++ b/packages/desktop-app/src/app/components/filter-menu/filter-menu.component.ts
@@ -48,6 +48,7 @@ export class FilterMenuComponent implements OnInit {
 
   // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types,max-len
   updateValue(event: any, data: { id?: string; category?: string; name: string; value: boolean; show?: boolean }[], form: FormGroup) {
+    console.log(data);
     data = data.map((o) => ({ id: o.id, name: o.name, value: o.value, category: o.category }));
     form.get(this.control).setValue(data);
   }
diff --git a/packages/desktop-app/src/app/components/integration-bar/integration-bar.component.ts b/packages/desktop-app/src/app/components/integration-bar/integration-bar.component.ts
index dcffa64aa..7a7a144fd 100644
--- a/packages/desktop-app/src/app/components/integration-bar/integration-bar.component.ts
+++ b/packages/desktop-app/src/app/components/integration-bar/integration-bar.component.ts
@@ -241,13 +241,13 @@ export class IntegrationBarComponent implements OnInit, OnDestroy {
     this.awsSsoOidcService.interrupt();
     this.loadingInBrowser = false;
     this.loadingInApp = false;
-    this.modalRef.hide();
+    this.modalRef?.hide();
   }
 
   catchClosingBrowserWindow(): void {
     this.loadingInBrowser = false;
     this.loadingInApp = false;
-    this.modalRef.hide();
+    this.modalRef?.hide();
   }
 
   gotoForm(modifying: number, awsSsoIntegration: AwsSsoIntegration): void {