diff --git a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list-page.service.ts b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list-page.service.ts
index daf0c0ae5c3..e91765cee89 100644
--- a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list-page.service.ts
+++ b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list-page.service.ts
@@ -127,6 +127,12 @@ export class ArtifactListPageService {
                             ClrLoadingState.ERROR
                         );
                     }
+                } else {
+                    this.updateStates(
+                        false,
+                        ClrLoadingState.ERROR,
+                        ClrLoadingState.ERROR
+                    );
                 }
             },
             error => {
diff --git a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html
index cc9ac24f3a7..ad601cf6d67 100644
--- a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html
+++ b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html
@@ -15,7 +15,6 @@
             <clr-dg-action-bar class="action-bar">
                 <div>
                     <button
-                        *ngIf="hasEnabledScanner"
                         id="scan-btn"
                         [clrLoading]="scanBtnState"
                         type="button"
@@ -35,7 +34,6 @@
                         <span>{{ 'VULNERABILITY.SCAN_NOW' | translate }}</span>
                     </button>
                     <button
-                        *ngIf="hasEnabledSbom()"
                         id="generate-sbom-btn"
                         [clrLoading]="generateSbomBtnState"
                         type="button"
@@ -69,7 +67,6 @@
                             <button
                                 clrDropdownItem
                                 id="stop-scan"
-                                *ngIf="hasEnabledScanner"
                                 [clrLoading]="stopBtnState"
                                 type="button"
                                 class="btn btn-secondary scan-btn action-dropdown-item"
@@ -84,7 +81,6 @@
                             <button
                                 clrDropdownItem
                                 id="stop-sbom-btn"
-                                *ngIf="hasEnabledSbom()"
                                 [clrLoading]="stopBtnState"
                                 type="button"
                                 class="btn btn-secondary scan-btn action-dropdown-item"
@@ -99,7 +95,6 @@
                                 <span>{{ 'SBOM.STOP' | translate }}</span>
                             </button>
                             <div
-                                *ngIf="hasEnabledScanner || hasEnabledSbom()"
                                 class="dropdown-divider"
                                 role="separator"
                                 aria-hidden="true"></div>