diff --git a/config.py b/config.py
index 233c9fcdd..87d19d2cd 100644
--- a/config.py
+++ b/config.py
@@ -36,6 +36,9 @@ SQLALCHEMY_DATABASE_URI = 'sqlite:///' + os.path.join(basedir, 'app.db')
 # Flask-WTF flag for CSRF
 CSRF_ENABLED = True
 
+#Whether to run the web server in debug mode or not
+DEBUG = True
+
 #------------------------------
 # GLOBALS FOR APP Builder
 #------------------------------
diff --git a/run.py b/run.py
index 3c2d0e5fc..954749f8c 100644
--- a/run.py
+++ b/run.py
@@ -1,5 +1,8 @@
 from app import app
 import config
 
-app.run(host='0.0.0.0', port=int(config.PANORAMIX_WEBSERVER_PORT), debug=True)
+app.run(
+    host='0.0.0.0',
+    port=int(config.PANORAMIX_WEBSERVER_PORT),
+    debug=config.DEBUG)