diff --git a/src/app/rx-stomp.config.ts b/src/app/rx-stomp.config.ts
index f36fcda1b7a855d93f37475d57f9f9436f1fa899..74ba1265b1d34d36a2c41082da20fed289e66171 100644
--- a/src/app/rx-stomp.config.ts
+++ b/src/app/rx-stomp.config.ts
@@ -1,4 +1,5 @@
 import { RxStompConfig } from '@stomp/rx-stomp';
+import { environment } from './../environments/environment';
 
 export const ARSRxStompConfig: RxStompConfig = {
   // Which server?
@@ -24,6 +25,8 @@ export const ARSRxStompConfig: RxStompConfig = {
   // It can be quite verbose, not recommended in production
   // Skip this key to stop logging to console
   debug: (msg: string): void => {
-    console.log(new Date(), 'STOMP debug: ' + msg);
+    if (environment.stomp_debug) {
+      console.log(new Date(), 'STOMP debug: ' + msg);
+    }
   }
 };
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 3f956e1600daa9fef4162030342379b5d4f88cee..b3a179353e3983c066418cf827c17d7945cc050e 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,4 +1,5 @@
 export const environment = {
   name: 'prod',
-  production: true
+  production: true,
+  stomp_debug: true
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b89261c7932d2da3341ce4b0abb2ebb3fd9e1018..6e22bf287f774979f24e9f00c23658a199f3b327 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -5,5 +5,6 @@
 
 export const environment = {
   name: 'dev',
-  production: false
+  production: false,
+  stomp_debug: true
 };