diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts
index f7b81dc4ef..8ce10c0c6b 100644
--- a/src/app/core/auth/auth.effects.ts
+++ b/src/app/core/auth/auth.effects.ts
@@ -1,7 +1,13 @@
-import { Injectable } from '@angular/core';
+import { Injectable, NgZone } from '@angular/core';
 
-import { combineLatest as observableCombineLatest, Observable, of as observableOf, timer } from 'rxjs';
-import { catchError, filter, map, switchMap, take, tap } from 'rxjs/operators';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  timer,
+  asyncScheduler, queueScheduler
+} from 'rxjs';
+import { catchError, filter, map, switchMap, take, tap, observeOn } from 'rxjs/operators';
 // import @ngrx
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Action, select, Store } from '@ngrx/store';
@@ -43,8 +49,8 @@ import { hasValue } from '../../shared/empty.util';
 import { environment } from '../../../environments/environment';
 import { RequestActionTypes } from '../data/request.actions';
 import { NotificationsActionTypes } from '../../shared/notifications/notifications.actions';
-import { ObjectCacheActionTypes } from '../cache/object-cache.actions';
-import { NO_OP_ACTION_TYPE } from '../../shared/ngrx/no-op.action';
+import { LeaveZoneScheduler } from '../utilities/leave-zone.scheduler';
+import { EnterZoneScheduler } from '../utilities/enter-zone.scheduler';
 
 // Action Types that do not break/prevent the user from an idle state
 const IDLE_TIMER_IGNORE_TYPES: string[]
@@ -261,22 +267,26 @@ export class AuthEffects {
   @Effect()
   public trackIdleness$: Observable<Action> = this.actions$.pipe(
     filter((action: Action) => !IDLE_TIMER_IGNORE_TYPES.includes(action.type)),
-    // Using switchMap the timer will be interrupted and restarted if a new action comes in, so idleness timer restarts
-    switchMap(() => {
-      return timer(environment.auth.ui.timeUntilIdle);
-    }),
-    map(() => {
-      return new SetUserAsIdleAction();
-    })
+    // Using switchMap the effect will stop subscribing to the previous timer if a new action comes
+    // in, and start a new timer
+    switchMap(() =>
+      // Start a timer outside of Angular's zone
+      timer(environment.auth.ui.timeUntilIdle, new LeaveZoneScheduler(this.zone, asyncScheduler))
+    ),
+    // Re-enter the zone to dispatch the action
+    observeOn(new EnterZoneScheduler(this.zone, queueScheduler)),
+    map(() => new SetUserAsIdleAction()),
   );
 
   /**
    * @constructor
    * @param {Actions} actions$
+   * @param {NgZone} zone
    * @param {AuthService} authService
    * @param {Store} store
    */
   constructor(private actions$: Actions,
+              private zone: NgZone,
               private authService: AuthService,
               private store: Store<AppState>) {
   }
diff --git a/src/app/core/utilities/enter-zone.scheduler.ts b/src/app/core/utilities/enter-zone.scheduler.ts
new file mode 100644
index 0000000000..96aee7d9a5
--- /dev/null
+++ b/src/app/core/utilities/enter-zone.scheduler.ts
@@ -0,0 +1,19 @@
+import { SchedulerLike, Subscription } from 'rxjs';
+import { NgZone } from '@angular/core';
+
+/**
+ *  An RXJS scheduler that will re-enter the Angular zone to run what's scheduled
+ */
+export class EnterZoneScheduler implements SchedulerLike {
+  constructor(private zone: NgZone, private scheduler: SchedulerLike) { }
+
+  schedule(...args: any[]): Subscription {
+    return this.zone.run(() =>
+      this.scheduler.schedule.apply(this.scheduler, args)
+    );
+  }
+
+  now (): number {
+    return this.scheduler.now();
+  }
+}
diff --git a/src/app/core/utilities/leave-zone.scheduler.ts b/src/app/core/utilities/leave-zone.scheduler.ts
new file mode 100644
index 0000000000..2587563661
--- /dev/null
+++ b/src/app/core/utilities/leave-zone.scheduler.ts
@@ -0,0 +1,19 @@
+import { SchedulerLike, Subscription } from 'rxjs';
+import { NgZone } from '@angular/core';
+
+/**
+ * An RXJS scheduler that will run what's scheduled outside of the Angular zone
+ */
+export class LeaveZoneScheduler implements SchedulerLike {
+  constructor(private zone: NgZone, private scheduler: SchedulerLike) { }
+
+  schedule(...args: any[]): Subscription {
+    return this.zone.runOutsideAngular(() =>
+      this.scheduler.schedule.apply(this.scheduler, args)
+    );
+  }
+
+  now (): number {
+    return this.scheduler.now();
+  }
+}