diff --git a/lib/server/job_server.py b/lib/server/job_server.py
index 6c8a720..1bafca5 100755
--- a/lib/server/job_server.py
+++ b/lib/server/job_server.py
@@ -508,11 +508,14 @@ def start_server(background_thread=False):
     zeroconf_server = ZeroconfServer("_zordon._tcp.local.", RenderQueue.hostname, RenderQueue.port)
     zeroconf_server.start()
 
-    if background_thread:
-        server_thread = threading.Thread(
-            target=lambda: server.run(host='0.0.0.0', port=RenderQueue.port, debug=False, use_reloader=False))
-        server_thread.start()
-        server_thread.join()
-    else:
-        server.run(host='0.0.0.0', port=RenderQueue.port, debug=config.get('flask_debug_enable', False),
-                   use_reloader=False, threaded=True)
\ No newline at end of file
+    try:
+        if background_thread:
+            server_thread = threading.Thread(
+                target=lambda: server.run(host='0.0.0.0', port=RenderQueue.port, debug=False, use_reloader=False))
+            server_thread.start()
+            server_thread.join()
+        else:
+            server.run(host='0.0.0.0', port=RenderQueue.port, debug=config.get('flask_debug_enable', False),
+                       use_reloader=False, threaded=True)
+    finally:
+        zeroconf_server.stop()
diff --git a/start_server.py b/start_server.py
index 52fd4a0..fc74445 100755
--- a/start_server.py
+++ b/start_server.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python3
 from lib.server.job_server import start_server
 
+import ssl
+ssl.OPENSSL_VERSION = ssl.OPENSSL_VERSION.replace("LibreSSL", "OpenSSL")
+
 if __name__ == '__main__':
     start_server()