diff --git a/headscale.py b/headscale.py
index 40842c8..585edf5 100644
--- a/headscale.py
+++ b/headscale.py
@@ -1,13 +1,13 @@
 # pylint: disable=wrong-import-order
 
-import requests, json, os, logging
+import requests, json, os
 from cryptography.fernet import Fernet
 from datetime            import timedelta, date
 from dateutil            import parser
-from flask               import Flask
+from flask               import Flask, current_app
 
 app = Flask(__name__)
-LOG = logging.getLogger("app")
+LOG = current_app.logger
 
 ##################################################################
 # Functions related to HEADSCALE and API KEYS
diff --git a/helper.py b/helper.py
index 8fe8f77..78abbe1 100644
--- a/helper.py
+++ b/helper.py
@@ -1,10 +1,10 @@
 # pylint: disable=wrong-import-order
 
-import os, headscale, requests, logging
-from flask import Flask
+import os, headscale, requests
+from flask import Flask, current_app
 
 app = Flask(__name__)
-LOG = logging.getLogger("app")
+LOG = current_app.logger
 
 def pretty_print_duration(duration, delta_type=""):
     """ Prints a duration in human-readable formats """
diff --git a/renderer.py b/renderer.py
index fc09998..eedc6b1 100644
--- a/renderer.py
+++ b/renderer.py
@@ -1,14 +1,14 @@
 # pylint: disable=line-too-long, wrong-import-order
 
-import headscale, helper, pytz, os, yaml, logging
-from flask              import Markup, render_template, Flask
+import headscale, helper, pytz, os, yaml
+from flask              import Markup, render_template, Flask, current_app
 from datetime           import datetime
 from dateutil           import parser
 from concurrent.futures import ALL_COMPLETED, wait
 from flask_executor     import Executor
 
 app = Flask(__name__)
-LOG = logging.getLogger("app")
+LOG = current_app.logger
 executor = Executor(app)
 
 def render_overview():