diff --git a/app.py b/app.py
index 9aff11e..648c608 100644
--- a/app.py
+++ b/app.py
@@ -64,7 +64,7 @@ except:
 config['version'] = version
 config['configpath'] = os.path.dirname(configpath)
 if 'timezone' not in config: config['timezone'] = 'UTC'
-if 'debug' not in config: config['debug'] = False
+if 'debug' not in config: config['debug'] = os.getenv('DEBUG') or False
 
 logging.basicConfig(
     format = '%(asctime)s.%(msecs)03d [%(levelname)s] %(name)s: %(message)s' if config['hide_ts'] == False else '[%(levelname)s] %(name)s: %(message)s',
diff --git a/config.yaml.sample b/config.yaml.sample
index 8b211cd..556b4f1 100644
--- a/config.yaml.sample
+++ b/config.yaml.sample
@@ -26,4 +26,3 @@ amcrest:
 
 timezone: America/New_York
 hide_ts: False
-debug: False
\ No newline at end of file