diff --git a/libloki/api.js b/libloki/api.js
index 60bcb069b..111fdfbd4 100644
--- a/libloki/api.js
+++ b/libloki/api.js
@@ -21,8 +21,7 @@
   const debugFlags = DebugFlagsEnum.ALL;
 
   const debugLogFn = (...args) => {
-    if (true) {
-      // process.env.NODE_ENV.includes('test-integration') ||
+    if (window.lokiFeatureFlags.debugMessageLogs) {
       window.console.warn(...args);
     }
   };
diff --git a/preload.js b/preload.js
index 804d7780e..9cb4f03be 100644
--- a/preload.js
+++ b/preload.js
@@ -435,6 +435,7 @@ window.lokiFeatureFlags = {
   useOnionRequests: true,
   useFileOnionRequests: false,
   onionRequestHops: 1,
+  debugMessageLogs: process.env.ENABLE_MESSAGE_LOGS,
 };
 
 // eslint-disable-next-line no-extend-native,func-names
@@ -469,5 +470,6 @@ if (config.environment.includes('test-integration')) {
     privateGroupChats: true,
     useSnodeProxy: !process.env.USE_STUBBED_NETWORK,
     useOnionRequests: false,
+    debugMessageLogs: true,
   };
 }