diff --git a/src/api/api_server.py b/src/api/api_server.py
index 664c09d..4063047 100755
--- a/src/api/api_server.py
+++ b/src/api/api_server.py
@@ -50,8 +50,11 @@ def start_server(hostname=None):
     flask_log.setLevel(Config.flask_log_level.upper())
 
     logger.debug('Starting API server')
-    server.run(host='0.0.0.0', port=server.config['PORT'], debug=Config.flask_debug_enable, use_reloader=False,
-               threaded=True)
+    try:
+        server.run(host=hostname, port=server.config['PORT'], debug=Config.flask_debug_enable, use_reloader=False,
+                   threaded=True)
+    finally:
+        logger.debug('Stopping API server')
 
 
 # --------------------------------------------