diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
index 6b5695ca790..364ab46e312 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
@@ -1,6 +1,8 @@
 import { AsyncPipe } from '@angular/common';
 import {
   Component,
+  NgZone,
+  OnDestroy,
   OnInit,
 } from '@angular/core';
 import {
@@ -39,7 +41,9 @@ import {
 import { UiSwitchModule } from 'ngx-ui-switch';
 import {
   BehaviorSubject,
+  interval,
   Observable,
+  Subscription,
 } from 'rxjs';
 import {
   filter,
@@ -67,7 +71,7 @@ import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
     UiSwitchModule,
   ],
 })
-export class SystemWideAlertFormComponent implements OnInit {
+export class SystemWideAlertFormComponent implements OnInit, OnDestroy {
 
   /**
    * Observable to track an existing system-wide alert
@@ -119,6 +123,11 @@ export class SystemWideAlertFormComponent implements OnInit {
    */
   previewDays: number;
 
+  /**
+   * Subscription used to periodically update the preview countdown timer
+   */
+  previewSubscription: Subscription;
+
 
   constructor(
     protected systemWideAlertDataService: SystemWideAlertDataService,
@@ -126,6 +135,7 @@ export class SystemWideAlertFormComponent implements OnInit {
     protected router: Router,
     protected requestService: RequestService,
     protected translateService: TranslateService,
+    protected ngZone: NgZone,
   ) {
   }
 
@@ -153,6 +163,14 @@ export class SystemWideAlertFormComponent implements OnInit {
       this.currentAlert = alert;
       this.initFormValues(alert);
     });
+
+    this.ngZone.runOutsideAngular(() => {
+      this.previewSubscription = interval(1000).subscribe(() => {
+        if (this.counterEnabled$.getValue() && this.date && this.time) {
+          this.ngZone.run(() => this.updatePreviewTime());
+        }
+      });
+    });
   }
 
   /**
@@ -231,6 +249,12 @@ export class SystemWideAlertFormComponent implements OnInit {
    * @param timeDifference  - The time difference to calculate and push the time units for
    */
   private allocateTimeUnits(timeDifference) {
+    if (timeDifference <= 0) {
+      this.previewMinutes = 0;
+      this.previewHours = 0;
+      this.previewDays = 0;
+      return;
+    }
     this.previewMinutes = Math.floor((timeDifference) / (1000 * 60) % 60);
     this.previewHours = Math.floor((timeDifference) / (1000 * 60 * 60) % 24);
     this.previewDays = Math.floor((timeDifference) / (1000 * 60 * 60 * 24));
@@ -295,5 +319,11 @@ export class SystemWideAlertFormComponent implements OnInit {
     this.router.navigate(['/home']);
   }
 
+  ngOnDestroy(): void {
+    if (this.previewSubscription) {
+      this.previewSubscription.unsubscribe();
+    }
+  }
+
 
 }