diff --git a/thermostat.py b/thermostat.py
index da9eafe..7c384f4 100755
--- a/thermostat.py
+++ b/thermostat.py
@@ -383,14 +383,15 @@ def thermostat_loop():
     time.sleep(load_shedder_interval)
   logging.info("====== Ended successfully ======")
 
-#if __name__ == '__main__':
 xprint('toto1')
 t1 = Thread(target=thermostat_loop)
-#t1.daemon = True
 t1.start()
 xprint('toto2')
 gunicorn_app = app
 xprint('toto3')
-#t1.join()
-#exit(0)
-#  app.run(host='0.0.0.0', port=3002)
+while True:
+  if stop.is_set():
+    dbconn.close()
+    break
+  time.sleep(0.5)
+exit(0)