diff --git a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html
index ad06f97c88..67b13cc49c 100644
--- a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html
+++ b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html
@@ -10,5 +10,5 @@
   </ds-viewable-collection>
 </div>
 <ds-loading *ngIf="isLoading()" message="{{'loading.mydspace-results' | translate}}"></ds-loading>
-<ds-error *ngIf="showError(searchResults)" message="{{errorMessageLabel(searchResults) | translate}}"></ds-error>
+<ds-error *ngIf="showError()" message="{{errorMessageLabel() | translate}}"></ds-error>
 <h3 *ngIf="searchResults?.payload?.page.length == 0" class="text-center text-muted" ><span>{{'mydspace.results.no-results' | translate}}</span></h3>
diff --git a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts
index 29a2e593de..5b069f4ddb 100644
--- a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts
@@ -40,9 +40,19 @@ describe('MyDSpaceResultsComponent', () => {
     expect(fixture.debugElement.query(By.css('a'))).toBeNull();
   });
 
-  it('should display error message if error is != 400', () => {
-    (comp as any).searchResults = { hasFailed: true, error: { statusCode: 500 } };
+  it('should display error message if error is 500', () => {
+    (comp as any).searchResults = { hasFailed: true, statusCode: 500 };
     fixture.detectChanges();
+    expect(comp.showError()).toBeTrue();
+    expect(comp.errorMessageLabel()).toBe('error.search-results');
+    expect(fixture.debugElement.query(By.css('ds-error'))).not.toBeNull();
+  });
+
+  it('should display error message if error is 422', () => {
+    (comp as any).searchResults = { hasFailed: true, statusCode: 422 };
+    fixture.detectChanges();
+    expect(comp.showError()).toBeTrue();
+    expect(comp.errorMessageLabel()).toBe('error.invalid-search-query');
     expect(fixture.debugElement.query(By.css('ds-error'))).not.toBeNull();
   });
 
diff --git a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts
index 96395adea2..77f27e9d42 100644
--- a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts
+++ b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts
@@ -59,11 +59,11 @@ export class MyDSpaceResultsComponent {
     return !this.searchResults || isEmpty(this.searchResults) || this.searchResults.isLoading;
   }
 
-  showError(searchResults: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>): boolean {
-    return searchResults?.hasFailed && (!searchResults?.errorMessage || searchResults?.statusCode !== 400);
+  showError(): boolean {
+    return this.searchResults?.hasFailed && (!this.searchResults?.errorMessage || this.searchResults?.statusCode !== 400);
   }
 
-  errorMessageLabel(searchResults: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>): string {
-    return (searchResults?.statusCode  === 422) ? 'error.invalid-search-query' : 'error.search-results';
+  errorMessageLabel(): string {
+    return (this.searchResults?.statusCode  === 422) ? 'error.invalid-search-query' : 'error.search-results';
   }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index a1b66eb332..8bc7502159 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -169,7 +169,7 @@ export class SearchFilterComponent implements OnInit {
                 return this.searchService.getFacetValuesFor(this.filter, 1, options).pipe(
                   filter((RD) => !RD.isLoading),
                   map((valuesRD) => {
-                    return valuesRD.payload.totalElements > 0;
+                    return valuesRD.payload?.totalElements > 0;
                   }),);
               }
             ));