diff --git a/repertory/repertory/src/ui/ui_server.cpp b/repertory/repertory/src/ui/ui_server.cpp
index 2dc2460b..5f1b0c90 100644
--- a/repertory/repertory/src/ui/ui_server.cpp
+++ b/repertory/repertory/src/ui/ui_server.cpp
@@ -999,6 +999,7 @@ void ui_server::stop() {
   stop_requested = true;
   notify_and_unlock(nonce_lock);
 
+  server_.stop();
   nonce_thread_->join();
 
   nonce_lock.lock();