diff --git a/.env.template b/.env.template
index 805fc4109ea7616911227a53bbee5f455e1ae88f..cb3a65b5421ffb929c93cf0763367f50b3ec681a 100644
--- a/.env.template
+++ b/.env.template
@@ -30,6 +30,9 @@ SUPERADMIN_EMAIL=admin@company.local
 # won't changed if SUPERADMIN_EMAIL is already in use
 SUPERADMIN_PASSWORD=SuperSecret123!
 
+# if true timing measurements will be logged
+DEBUG_PERFORMANCE=false
+
 ##########
 # SECURITY
 ##########
diff --git a/app.js b/app.js
index 38fee1efd6115c749baf2146ac7d0a218104c65f..8fa4a049c738f5724ebc043f40e84ec346aefc36 100644
--- a/app.js
+++ b/app.js
@@ -24,7 +24,9 @@ const observer = new PerformanceObserver((list, observer) => {
         // calculate
         const measurement = performance.measure(measurementName, startName, entry.name);
         // log
-        console.info({ name: measurement.name, duration: `${measurement.duration} ms` });
+        if (process.env.DEBUG_PERFORMANCE === 'true') {
+          console.info({ name: measurement.name, duration: `${measurement.duration} ms` });
+        }
 
         // clear
         performance.clearMarks(entry.name);
@@ -36,9 +38,7 @@ const observer = new PerformanceObserver((list, observer) => {
       // clear
       performance.clearMarks(entry.name);
     }
-
     // observer.disconnect();
-
   }
 });
 observer.observe({ entryTypes: ['mark'] });
diff --git a/utils/handleAI.js b/utils/handleAI.js
index 2cdd639f9e832dff0e802c9cb1e13b04d0705ffc..d6d0eed2fa91de6ac77f1fb9876b24b53be74162 100644
--- a/utils/handleAI.js
+++ b/utils/handleAI.js
@@ -201,6 +201,7 @@ export const chat = async (req, res, next) => {
   result.answer = result.answer.substring(5);
   performance.mark('setSourceLocation:end');
 
+  console.log(JSON.stringify(result));
 
   // store q/a-pair in chat history
   let chat = await extendChat(req.body.chatId, [
@@ -209,6 +210,7 @@ export const chat = async (req, res, next) => {
   ]);
   performance.mark('chat:end');
 
+
   // return the answer
   return res.json({ answer: result.answer, chat });
 };
\ No newline at end of file