diff --git a/src/oteltest/sink/__init__.py b/src/oteltest/sink/__init__.py
index ac1404c..372f075 100644
--- a/src/oteltest/sink/__init__.py
+++ b/src/oteltest/sink/__init__.py
@@ -95,6 +95,7 @@ def stop(self):
 class HttpSink:
 
     def __init__(self, listener, logger: logging.Logger, port=4318, daemon=True):
+        self.httpd = None
         self.listener = listener
         self.logger = logger
         self.port = port
@@ -133,8 +134,8 @@ def do_POST(this):
                 this.wfile.write("OK".encode("utf-8"))
 
         # noinspection PyTypeChecker
-        httpd = HTTPServer(("", self.port), Handler)
-        httpd.serve_forever()
+        self.httpd = HTTPServer(("", self.port), Handler)
+        self.httpd.serve_forever()
 
     def handle_trace(self, post_data, headers):
         req = ExportTraceServiceRequest()
@@ -152,6 +153,7 @@ def handle_logs(self, post_data, headers):
         self.listener.handle_logs(req, headers)
 
     def stop(self):
+        self.httpd.shutdown()
         self.svr_thread.join()
 
 
diff --git a/src/oteltest/version.py b/src/oteltest/version.py
index d9f2629..2d93b0c 100644
--- a/src/oteltest/version.py
+++ b/src/oteltest/version.py
@@ -1 +1 @@
-__version__ = "0.36.0"
+__version__ = "0.37.0"