diff --git a/src/app/+my-dspace-page/my-dspace-page.component.ts b/src/app/+my-dspace-page/my-dspace-page.component.ts
index a173a39d99..712a25b0c0 100644
--- a/src/app/+my-dspace-page/my-dspace-page.component.ts
+++ b/src/app/+my-dspace-page/my-dspace-page.component.ts
@@ -67,7 +67,7 @@ export class MyDSpacePageComponent implements OnInit {
   /**
    * The current relevant scopes
    */
-  scopeListRD$: Observable<DSpaceObject[]>;
+  scopeListRD$: Observable<DSpaceObject[]> = new BehaviorSubject([]);
 
   /**
    * Emits true if were on a small screen
diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts
index 610811981c..b2a5b9a6eb 100644
--- a/src/app/+search-page/search-page.component.ts
+++ b/src/app/+search-page/search-page.component.ts
@@ -53,7 +53,7 @@ export class SearchPageComponent implements OnInit {
   /**
    * The current relevant scopes
    */
-  scopeListRD$: Observable<DSpaceObject[]> = new BehaviorSubject(null);
+  scopeListRD$: Observable<DSpaceObject[]> = new BehaviorSubject([]);
 
   /**
    * Emits true if were on a small screen
@@ -86,9 +86,9 @@ export class SearchPageComponent implements OnInit {
       .subscribe((results) => {
         this.resultsRD$.next(results);
       });
-/*    this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(
+    this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(
       switchMap((scopeId) => this.service.getScopes(scopeId))
-    );*/
+    );
   }
 
   /**
diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts
index b83481fb24..9cce2509ef 100644
--- a/src/app/core/data/request.service.spec.ts
+++ b/src/app/core/data/request.service.spec.ts
@@ -1,7 +1,7 @@
 import * as ngrx from '@ngrx/store';
 import { ActionsSubject, Store } from '@ngrx/store';
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { EMPTY, of as observableOf } from 'rxjs';
+import { BehaviorSubject, EMPTY, of as observableOf } from 'rxjs';
 import { getMockObjectCacheService } from '../../shared/mocks/mock-object-cache.service';
 import { defaultUUID, getMockUUIDService } from '../../shared/mocks/mock-uuid.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
index 05eee97d2a..c05eb557d2 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
@@ -7,7 +7,7 @@ import { TranslateService } from '@ngx-translate/core';
 
 import { Workspaceitem } from '../../../core/submission/models/workspaceitem.model';
 import { MyDSpaceActionsComponent } from '../mydspace-actions';
-import { SubmissionRestService } from '../../../submission/submission-rest.service';
+import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
 import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
 import { ResourceType } from '../../../core/shared/resource-type';
 import { NotificationsService } from '../../notifications/notifications.service';