diff --git a/repertory/librepertory/src/rpc/server/server.cpp b/repertory/librepertory/src/rpc/server/server.cpp
index ff2d218d..4b643d2c 100644
--- a/repertory/librepertory/src/rpc/server/server.cpp
+++ b/repertory/librepertory/src/rpc/server/server.cpp
@@ -198,6 +198,10 @@ void server::stop() {
   thread->join();
   thread.reset();
 
+  lock.lock();
+  server_.reset();
+  lock.unlock();
+
   event_system::instance().raise<service_shutdown_end>("server");
 }
 } // namespace repertory