diff --git a/src/app/core/data/system-wide-alert-data.service.ts b/src/app/core/data/system-wide-alert-data.service.ts
index b0c0488ab0..afff0ef9ef 100644
--- a/src/app/core/data/system-wide-alert-data.service.ts
+++ b/src/app/core/data/system-wide-alert-data.service.ts
@@ -33,7 +33,7 @@ import { RequestService } from './request.service';
 /**
  * Dataservice representing a system-wide alert
  */
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class SystemWideAlertDataService extends IdentifiableDataService<SystemWideAlert> implements FindAllData<SystemWideAlert>, CreateData<SystemWideAlert>, PutData<SystemWideAlert>, SearchData<SystemWideAlert> {
   private findAllData: FindAllDataImpl<SystemWideAlert>;
   private createData: CreateDataImpl<SystemWideAlert>;
diff --git a/src/app/root.module.ts b/src/app/root.module.ts
index a3e32489ef..ba70f5ec70 100644
--- a/src/app/root.module.ts
+++ b/src/app/root.module.ts
@@ -28,11 +28,9 @@ import { ThemedRootComponent } from './root/themed-root.component';
 import { IdleModalComponent } from './shared/idle-modal/idle-modal.component';
 import { NotificationComponent } from './shared/notifications/notification/notification.component';
 import { NotificationsBoardComponent } from './shared/notifications/notifications-board/notifications-board.component';
-import { SystemWideAlertModule } from './system-wide-alert/system-wide-alert.module';
 
 const IMPORTS = [
   CommonModule,
-  SystemWideAlertModule,
   NgbModule,
 ];
 
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
index 32afa2cb4c..5804b469b8 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
@@ -23,7 +23,6 @@ import { NotificationsServiceStub } from '../../shared/testing/notifications-ser
 import { RouterStub } from '../../shared/testing/router.stub';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { SystemWideAlert } from '../system-wide-alert.model';
-import { SystemWideAlertModule } from '../system-wide-alert.module';
 import { SystemWideAlertFormComponent } from './system-wide-alert-form.component';
 
 describe('SystemWideAlertFormComponent', () => {
@@ -63,7 +62,7 @@ describe('SystemWideAlertFormComponent', () => {
     router = new RouterStub();
 
     TestBed.configureTestingModule({
-      imports: [FormsModule, SystemWideAlertModule, UiSwitchModule, TranslateModule.forRoot(), SystemWideAlertFormComponent],
+      imports: [FormsModule, UiSwitchModule, TranslateModule.forRoot(), SystemWideAlertFormComponent],
       providers: [
         { provide: SystemWideAlertDataService, useValue: systemWideAlertDataService },
         { provide: NotificationsService, useValue: notificationsService },
diff --git a/src/app/system-wide-alert/system-wide-alert.module.ts b/src/app/system-wide-alert/system-wide-alert.module.ts
deleted file mode 100644
index d974a89d50..0000000000
--- a/src/app/system-wide-alert/system-wide-alert.module.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { NgModule } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-import {
-  NgbDatepickerModule,
-  NgbTimepickerModule,
-} from '@ng-bootstrap/ng-bootstrap';
-import { UiSwitchModule } from 'ngx-ui-switch';
-
-import { SystemWideAlertDataService } from '../core/data/system-wide-alert-data.service';
-import { SystemWideAlertBannerComponent } from './alert-banner/system-wide-alert-banner.component';
-import { SystemWideAlertFormComponent } from './alert-form/system-wide-alert-form.component';
-
-@NgModule({
-  imports: [
-    FormsModule,
-    UiSwitchModule,
-    NgbTimepickerModule,
-    NgbDatepickerModule,
-    SystemWideAlertBannerComponent,
-    SystemWideAlertFormComponent,
-  ],
-  exports: [
-    SystemWideAlertBannerComponent,
-  ],
-  providers: [
-    SystemWideAlertDataService,
-  ],
-})
-export class SystemWideAlertModule {
-
-}
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 64305a40ad..18e90974a6 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -14,7 +14,6 @@ import { IdlePreloadModule } from 'angular-idle-preload';
 
 import { AppModule } from '../../app/app.module';
 import { RootModule } from '../../app/root.module';
-import { SystemWideAlertModule } from '../../app/system-wide-alert/system-wide-alert.module';
 import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
 import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
 import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
@@ -201,7 +200,6 @@ const DECLARATIONS = [
     StoreRouterConnectingModule,
     TranslateModule,
     FormsModule,
-    SystemWideAlertModule,
     NgxGalleryModule,
     ...DECLARATIONS,
   ],