diff --git a/application/api/answer/routes.py b/application/api/answer/routes.py
index 31aa43ac..e877fac5 100644
--- a/application/api/answer/routes.py
+++ b/application/api/answer/routes.py
@@ -1,7 +1,6 @@
 import asyncio
 import datetime
 import json
-import logging
 import os
 import traceback
 
@@ -19,7 +18,6 @@ from application.llm.llm_creator import LLMCreator
 from application.retriever.retriever_creator import RetrieverCreator
 from application.utils import check_required_fields, limit_chat_history
 
-logger = logging.getLogger(__name__)
 
 mongo = MongoDB.get_client()
 db = mongo["docsgpt"]
@@ -262,8 +260,8 @@ def complete_stream(
         data = json.dumps({"type": "end"})
         yield f"data: {data}\n\n"
     except Exception as e:
-        logger.error(f"Error in stream: {str(e)}")
-        logger.error(traceback.format_exc())
+        current_app.logger.error(f"Error in stream: {str(e)}")
+        current_app.logger.error(traceback.format_exc())
         data = json.dumps(
             {
                 "type": "error",
diff --git a/application/app.py b/application/app.py
index d7727001..4eb40331 100644
--- a/application/app.py
+++ b/application/app.py
@@ -2,22 +2,22 @@ import platform
 
 import dotenv
 from flask import Flask, redirect, request
-
-from application.api.answer.routes import answer
-from application.api.internal.routes import internal
-from application.api.user.routes import user
-from application.celery_init import celery
 from application.core.logging_config import setup_logging
-from application.core.settings import settings
-from application.extensions import api
+setup_logging()
+
+from application.api.answer.routes import answer # noqa: E402
+from application.api.internal.routes import internal # noqa: E402
+from application.api.user.routes import user # noqa: E402
+from application.celery_init import celery # noqa: E402
+from application.core.settings import settings # noqa: E402
+from application.extensions import api # noqa: E402
+
 
 if platform.system() == "Windows":
     import pathlib
-
     pathlib.PosixPath = pathlib.WindowsPath
 
 dotenv.load_dotenv()
-setup_logging()
 
 app = Flask(__name__)
 app.register_blueprint(user)