diff --git a/angular.json b/angular.json
index d158577e06..69fae4d18b 100644
--- a/angular.json
+++ b/angular.json
@@ -87,6 +87,12 @@
                   "maximumWarning": "200kb",
                   "maximumError": "300kb"
                 }
+              ],
+              "fileReplacements": [
+                {
+                  "replace": "src/config/store/devtools.ts",
+                  "with": "src/config/store/devtools.prod.ts"
+                }
               ]
             }
           }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 131e6c6b58..df4de46c77 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -52,6 +52,7 @@ import { IdleModalComponent } from './shared/idle-modal/idle-modal.component';
 
 import { UUIDService } from './core/shared/uuid.service';
 import { CookieService } from './core/services/cookie.service';
+import { StoreDevModules } from '../config/store/devtools';
 
 export function getBase() {
   return environment.ui.nameSpace;
@@ -75,15 +76,9 @@ const IMPORTS = [
   StoreModule.forRoot(appReducers, storeModuleConfig),
   StoreRouterConnectingModule.forRoot(),
   ThemedEntryComponentModule.withEntryComponents(),
+  StoreDevModules,
 ];
 
-IMPORTS.push(
-  StoreDevtoolsModule.instrument({
-    maxAge: 1000,
-    logOnly: environment.production,
-  })
-);
-
 const PROVIDERS = [
   {
     provide: APP_BASE_HREF,
diff --git a/src/config/store/devtools.prod.ts b/src/config/store/devtools.prod.ts
new file mode 100644
index 0000000000..10676d0edf
--- /dev/null
+++ b/src/config/store/devtools.prod.ts
@@ -0,0 +1,4 @@
+/**
+ * This disabled DevTools in Production mode, overriding the defaults in devtools.ts
+ */
+export const StoreDevModules = [];
diff --git a/src/config/store/devtools.ts b/src/config/store/devtools.ts
new file mode 100644
index 0000000000..5672efccd3
--- /dev/null
+++ b/src/config/store/devtools.ts
@@ -0,0 +1,10 @@
+import { StoreDevtoolsModule } from '@ngrx/store-devtools';
+
+export const StoreDevModules = [
+  // This enables Redux DevTools by default.
+  // Note: this is overridden in production by devtools.prod.ts
+  StoreDevtoolsModule.instrument({
+    maxAge: 1000,
+    logOnly: false,
+  })
+];