diff --git a/angular.json b/angular.json
index b81ba049fa..56e06bd86c 100644
--- a/angular.json
+++ b/angular.json
@@ -79,6 +79,10 @@
                 {
                   "replace": "src/environments/environment.ts",
                   "with": "src/environments/environment.production.ts"
+                },
+                {
+                  "replace": "src/config/store/devtools.ts",
+                  "with": "src/config/store/devtools.prod.ts"
                 }
               ],
               "optimization": true,
@@ -204,6 +208,10 @@
                 {
                   "replace": "src/environments/environment.ts",
                   "with": "src/environments/environment.production.ts"
+                },
+                {
+                  "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 2c3e0ea3ee..c133efdd5c 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -8,7 +8,6 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { EffectsModule } from '@ngrx/effects';
 import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store';
 import { MetaReducer, Store, StoreModule, USER_PROVIDED_META_REDUCERS } from '@ngrx/store';
-import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import {
   DYNAMIC_ERROR_MESSAGES_MATCHER,
   DYNAMIC_MATCHER_PROVIDERS,
@@ -61,6 +60,8 @@ import { ThemedAdminSidebarComponent } from './admin/admin-sidebar/themed-admin-
 import { APP_CONFIG, AppConfig } from '../config/app-config.interface';
 import { NgxMaskModule } from 'ngx-mask';
 
+import { StoreDevModules } from '../config/store/devtools';
+
 export function getConfig() {
   return environment;
 }
@@ -96,15 +97,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_CONFIG,
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,
+  })
+];