diff --git a/rai/core/core.cpp b/rai/core/core.cpp
index 12491f90..b415679c 100644
--- a/rai/core/core.cpp
+++ b/rai/core/core.cpp
@@ -2035,7 +2035,7 @@ void rai::client::stop ()
 {
     network.stop ();
     bootstrap.stop ();
-    processor.stop ();
+    service.stop ();
 }
 
 void rai::processor::bootstrap (boost::asio::ip::tcp::endpoint const & endpoint_a, std::function <void ()> const & complete_action_a)
diff --git a/rai/test/client.cpp b/rai/test/client.cpp
index 61e2ce89..9863048c 100644
--- a/rai/test/client.cpp
+++ b/rai/test/client.cpp
@@ -1,6 +1,15 @@
 #include <gtest/gtest.h>
 #include <rai/core/core.hpp>
 
+TEST (client, stop)
+{
+    rai::system system (24000, 1);
+    system.clients [0]->stop ();
+    system.processor.run ();
+    system.service->run ();
+    ASSERT_TRUE (true);
+}
+
 TEST (client, block_store_path_failure)
 {
     rai::client_init init;