diff --git a/logger.py b/logger.py
index a39cd42..5c8b96f 100644
--- a/logger.py
+++ b/logger.py
@@ -74,7 +74,7 @@ class ESHandler(logging.Handler):
         return response
     except urllib.error.HTTPError as e:
         print('Unable to reach elastic, error:', e)
-        return asdf
+        return
 
 class ElasticFieldParameterAdapter(logging.LoggerAdapter):
   def __init__(self, logger, extra={}):
@@ -93,12 +93,15 @@ esHost = config['ELASTIC']['host']
 esPort = config['ELASTIC']['port']
 esSSL = config['ELASTIC']['ssl']
 esApiKey = config['ELASTIC']['api_key']
-eh = ESHandler(host=esHost, port=esPort, ssl=esSSL, apiKey=esApiKey)
-eh.setLevel(logging.DEBUG)
+esEnabled = config['ELASTIC']['enabled']
+if esEnabled == 'True':
+  eh = ESHandler(host=esHost, port=esPort, ssl=esSSL, apiKey=esApiKey)
+  eh.setLevel(logging.DEBUG)
 
 formatter = logging.Formatter('%(asctime)s %(levelname)8s | %(message)s')
 fh.setFormatter(formatter)
 logger.addHandler(fh)
 logger.addHandler(ch)
-logger.addHandler(eh)
+if esEnabled == 'True':
+  logger.addHandler(eh)
 logger = ElasticFieldParameterAdapter(logger)