diff --git a/modules/ui/src/app/components/download-report-zip/download-report-zip.component.spec.ts b/modules/ui/src/app/components/download-report-zip/download-report-zip.component.spec.ts
index e2b56d42d..d87200987 100644
--- a/modules/ui/src/app/components/download-report-zip/download-report-zip.component.spec.ts
+++ b/modules/ui/src/app/components/download-report-zip/download-report-zip.component.spec.ts
@@ -78,7 +78,6 @@ describe('DownloadReportZipComponent', () => {
         expect(openSpy).toHaveBeenCalledWith(DownloadZipModalComponent, {
           ariaLabel: 'Download zip',
           data: {
-            hasProfiles: false,
             profiles: [],
           },
           autoFocus: true,
@@ -105,7 +104,6 @@ describe('DownloadReportZipComponent', () => {
           expect(openSpy).toHaveBeenCalledWith(DownloadZipModalComponent, {
             ariaLabel: 'Download zip',
             data: {
-              hasProfiles: false,
               profiles: [],
             },
             autoFocus: true,
@@ -131,7 +129,6 @@ describe('DownloadReportZipComponent', () => {
         expect(openSpy).toHaveBeenCalledWith(DownloadZipModalComponent, {
           ariaLabel: 'Download zip',
           data: {
-            hasProfiles: false,
             profiles: [],
           },
           autoFocus: true,
diff --git a/modules/ui/src/app/components/download-report-zip/download-report-zip.component.ts b/modules/ui/src/app/components/download-report-zip/download-report-zip.component.ts
index 5511e3174..e7b106f05 100644
--- a/modules/ui/src/app/components/download-report-zip/download-report-zip.component.ts
+++ b/modules/ui/src/app/components/download-report-zip/download-report-zip.component.ts
@@ -47,7 +47,6 @@ export class DownloadReportZipComponent
   implements OnDestroy, OnInit
 {
   private destroy$: Subject<boolean> = new Subject<boolean>();
-  @Input() hasProfiles: boolean = false;
   @Input() profiles: Profile[] = [];
   @Input() url: string | null | undefined = null;
 
@@ -61,7 +60,6 @@ export class DownloadReportZipComponent
     const dialogRef = this.dialog.open(DownloadZipModalComponent, {
       ariaLabel: 'Download zip',
       data: {
-        hasProfiles: this.hasProfiles,
         profiles: this.profiles,
       },
       autoFocus: true,
diff --git a/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.html b/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.html
index 4af4e9679..b3dfb77f4 100644
--- a/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.html
+++ b/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.html
@@ -19,7 +19,7 @@
   Risk assessment profile for your ZIP report.
 </p>
 
-<div *ngIf="data.hasProfiles">
+<div *ngIf="profiles.length > 0">
   <mat-form-field appearance="outline" class="profile-select">
     <mat-select
       #select
@@ -78,7 +78,7 @@
 </div>
 
 <mat-dialog-actions
-  *ngIf="!data.hasProfiles"
+  *ngIf="profiles.length === 0"
   align="end"
   class="risk-profile-select-form-actions">
   <button
diff --git a/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.spec.ts b/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.spec.ts
index df4d65fd5..cdd4c665f 100644
--- a/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.spec.ts
+++ b/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.spec.ts
@@ -31,7 +31,6 @@ describe('DownloadZipModalComponent', () => {
         {
           provide: MAT_DIALOG_DATA,
           useValue: {
-            hasProfiles: true,
             profiles: [PROFILE_MOCK_2, PROFILE_MOCK],
           },
         },
@@ -44,7 +43,6 @@ describe('DownloadZipModalComponent', () => {
     beforeEach(() => {
       TestBed.overrideProvider(MAT_DIALOG_DATA, {
         useValue: {
-          hasProfiles: true,
           profiles: [PROFILE_MOCK_2, PROFILE_MOCK, PROFILE_MOCK_3],
         },
       });
@@ -133,7 +131,6 @@ describe('DownloadZipModalComponent', () => {
     beforeEach(() => {
       TestBed.overrideProvider(MAT_DIALOG_DATA, {
         useValue: {
-          hasProfiles: false,
           profiles: [],
         },
       });
diff --git a/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.ts b/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.ts
index 918233c7d..395bcb480 100644
--- a/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.ts
+++ b/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.ts
@@ -19,7 +19,6 @@ import { MatOptionModule } from '@angular/material/core';
 import { TestRunService } from '../../services/test-run.service';
 
 interface DialogData {
-  hasProfiles: boolean;
   profiles: Profile[];
 }
 
@@ -50,10 +49,10 @@ export class DownloadZipModalComponent extends EscapableDialogComponent {
     @Inject(MAT_DIALOG_DATA) public data: DialogData
   ) {
     super(dialogRef);
-    if (data.hasProfiles) {
-      this.profiles = data.profiles.filter(
-        profile => profile.status === ProfileStatus.VALID
-      );
+    this.profiles = data.profiles.filter(
+      profile => profile.status === ProfileStatus.VALID
+    );
+    if (this.profiles.length > 0) {
       this.profiles.sort((a, b) =>
         a.name.toLowerCase().localeCompare(b.name.toLowerCase())
       );
diff --git a/modules/ui/src/app/pages/reports/reports.component.html b/modules/ui/src/app/pages/reports/reports.component.html
index 68bd31599..6fc7017a8 100644
--- a/modules/ui/src/app/pages/reports/reports.component.html
+++ b/modules/ui/src/app/pages/reports/reports.component.html
@@ -154,7 +154,6 @@ <h2 class="title" tabindex="-1">Reports</h2>
                 *ngIf="data?.device"
                 [data]="data"
                 [url]="data.report"
-                [hasProfiles]="vm.hasProfiles"
                 [profiles]="vm.profiles">
                 <span class="download-report-zip-icon-container">
                   <mat-icon
diff --git a/modules/ui/src/app/pages/reports/reports.component.spec.ts b/modules/ui/src/app/pages/reports/reports.component.spec.ts
index b76c3f574..19a0a827d 100644
--- a/modules/ui/src/app/pages/reports/reports.component.spec.ts
+++ b/modules/ui/src/app/pages/reports/reports.component.spec.ts
@@ -70,7 +70,6 @@ describe('ReportsComponent', () => {
       dataLoaded: dataLoaded,
       selectedRow: null,
       isFiltersEmpty: true,
-      hasProfiles: false,
       profiles: [],
     });
   };
diff --git a/modules/ui/src/app/pages/reports/reports.store.spec.ts b/modules/ui/src/app/pages/reports/reports.store.spec.ts
index d81fe7c91..e78b40036 100644
--- a/modules/ui/src/app/pages/reports/reports.store.spec.ts
+++ b/modules/ui/src/app/pages/reports/reports.store.spec.ts
@@ -33,10 +33,7 @@ import { HttpErrorResponse } from '@angular/common/http';
 import { MatRow } from '@angular/material/table';
 import { MatSort } from '@angular/material/sort';
 import { provideMockStore } from '@ngrx/store/testing';
-import {
-  selectHasRiskProfiles,
-  selectRiskProfiles,
-} from '../../store/selectors';
+import { selectRiskProfiles } from '../../store/selectors';
 
 describe('ReportsStore', () => {
   let reportsStore: ReportsStore;
@@ -50,10 +47,7 @@ describe('ReportsStore', () => {
         ReportsStore,
         { provide: TestRunService, useValue: mockService },
         provideMockStore({
-          selectors: [
-            { selector: selectHasRiskProfiles, value: false },
-            { selector: selectRiskProfiles, value: [] },
-          ],
+          selectors: [{ selector: selectRiskProfiles, value: [] }],
         }),
         DatePipe,
       ],
@@ -151,7 +145,6 @@ describe('ReportsStore', () => {
           dataLoaded: false,
           selectedRow: null,
           isFiltersEmpty: true,
-          hasProfiles: false,
           profiles: [],
         });
         done();
diff --git a/modules/ui/src/app/pages/reports/reports.store.ts b/modules/ui/src/app/pages/reports/reports.store.ts
index 1a224d7bc..ab93a1085 100644
--- a/modules/ui/src/app/pages/reports/reports.store.ts
+++ b/modules/ui/src/app/pages/reports/reports.store.ts
@@ -8,10 +8,7 @@ import { catchError, EMPTY, exhaustMap } from 'rxjs';
 import { tap, withLatestFrom } from 'rxjs/operators';
 import { DatePipe } from '@angular/common';
 import { MatSort } from '@angular/material/sort';
-import {
-  selectHasRiskProfiles,
-  selectRiskProfiles,
-} from '../../store/selectors';
+import { selectRiskProfiles } from '../../store/selectors';
 import { Store } from '@ngrx/store';
 import { AppState } from '../../store/state';
 
@@ -45,7 +42,6 @@ export class ReportsStore extends ComponentStore<ReportsComponentState> {
   private isFiltersEmpty$ = this.select(state => state.isFiltersEmpty);
   private history$ = this.select(state => state.history);
   private profiles$ = this.store.select(selectRiskProfiles);
-  private hasProfiles$ = this.store.select(selectHasRiskProfiles);
   viewModel$ = this.select({
     displayedColumns: this.displayedColumns$,
     chips: this.chips$,
@@ -56,7 +52,6 @@ export class ReportsStore extends ComponentStore<ReportsComponentState> {
     dataLoaded: this.dataLoaded$,
     selectedRow: this.selectedRow$,
     isFiltersEmpty: this.isFiltersEmpty$,
-    hasProfiles: this.hasProfiles$,
     profiles: this.profiles$,
   });
 
diff --git a/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.html b/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.html
index ea6a75ab2..6dc3b10ac 100644
--- a/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.html
+++ b/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.html
@@ -33,7 +33,6 @@
       id="downloadReportZip"
       class="download-option zip"
       [url]="data.report"
-      [hasProfiles]="hasProfiles"
       [profiles]="profiles">
       <mat-option
         (onSelectionChange)="onZipSelected($event)"
diff --git a/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.ts b/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.ts
index 943616d5b..fddd6822f 100644
--- a/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.ts
+++ b/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.ts
@@ -55,7 +55,6 @@ export enum DownloadOption {
 })
 export class DownloadOptionsComponent {
   @ViewChild('downloadReportZip') downloadReportZip!: ElementRef;
-  @Input() hasProfiles: boolean = false;
   @Input() profiles: Profile[] = [];
   @Input() data!: TestrunStatus;
   DownloadOption = DownloadOption;
diff --git a/modules/ui/src/app/pages/testrun/testrun.component.html b/modules/ui/src/app/pages/testrun/testrun.component.html
index f19d2df6a..d485d1926 100644
--- a/modules/ui/src/app/pages/testrun/testrun.component.html
+++ b/modules/ui/src/app/pages/testrun/testrun.component.html
@@ -52,8 +52,7 @@ <h2 class="title progress-title" tabindex="-1">
             <app-download-options
               *ngIf="data.report"
               [data]="data"
-              [profiles]="vm.profiles"
-              [hasProfiles]="vm.hasProfiles"></app-download-options>
+              [profiles]="vm.profiles"></app-download-options>
           </div>
         </div>
         <app-testrun-status-card [systemStatus]="vm.systemStatus">
diff --git a/modules/ui/src/app/pages/testrun/testrun.component.spec.ts b/modules/ui/src/app/pages/testrun/testrun.component.spec.ts
index 431895b16..98d1b986f 100644
--- a/modules/ui/src/app/pages/testrun/testrun.component.spec.ts
+++ b/modules/ui/src/app/pages/testrun/testrun.component.spec.ts
@@ -571,6 +571,5 @@ class FakeProgressTableComponent {
 })
 class FakeDownloadOptionsComponent {
   @Input() data!: TestrunStatus;
-  @Input() hasProfiles!: boolean;
   @Input() profiles!: Profile[];
 }
diff --git a/modules/ui/src/app/pages/testrun/testrun.store.spec.ts b/modules/ui/src/app/pages/testrun/testrun.store.spec.ts
index 2143c4874..03f7817af 100644
--- a/modules/ui/src/app/pages/testrun/testrun.store.spec.ts
+++ b/modules/ui/src/app/pages/testrun/testrun.store.spec.ts
@@ -20,7 +20,6 @@ import { skip, take } from 'rxjs';
 import {
   selectHasConnectionSettings,
   selectHasDevices,
-  selectHasRiskProfiles,
   selectIsOpenStartTestrun,
   selectRiskProfiles,
   selectSystemStatus,
@@ -66,7 +65,6 @@ describe('TestrunStore', () => {
             { selector: selectSystemStatus, value: null },
             { selector: selectHasConnectionSettings, value: true },
             { selector: selectIsOpenStartTestrun, value: false },
-            { selector: selectHasRiskProfiles, value: false },
             { selector: selectRiskProfiles, value: [] },
           ],
         }),
@@ -90,7 +88,6 @@ describe('TestrunStore', () => {
           systemStatus: null,
           dataSource: [],
           stepsToResolveCount: 0,
-          hasProfiles: false,
           profiles: [],
         });
         done();
diff --git a/modules/ui/src/app/pages/testrun/testrun.store.ts b/modules/ui/src/app/pages/testrun/testrun.store.ts
index 5ae65808d..eacad9959 100644
--- a/modules/ui/src/app/pages/testrun/testrun.store.ts
+++ b/modules/ui/src/app/pages/testrun/testrun.store.ts
@@ -21,7 +21,6 @@ import { AppState } from '../../store/state';
 import { Store } from '@ngrx/store';
 import {
   selectHasDevices,
-  selectHasRiskProfiles,
   selectIsOpenStartTestrun,
   selectRiskProfiles,
   selectSystemStatus,
@@ -58,7 +57,6 @@ export class TestrunStore extends ComponentStore<TestrunComponentState> {
   );
   private hasDevices$ = this.store.select(selectHasDevices);
   private profiles$ = this.store.select(selectRiskProfiles);
-  private hasProfiles$ = this.store.select(selectHasRiskProfiles);
   private systemStatus$ = this.store.select(selectSystemStatus);
   isOpenStartTestrun$ = this.store.select(selectIsOpenStartTestrun);
   viewModel$ = this.select({
@@ -66,7 +64,6 @@ export class TestrunStore extends ComponentStore<TestrunComponentState> {
     systemStatus: this.systemStatus$,
     dataSource: this.dataSource$,
     stepsToResolveCount: this.stepsToResolveCount$,
-    hasProfiles: this.hasProfiles$,
     profiles: this.profiles$,
   });