diff --git a/api/storage_service.cc b/api/storage_service.cc
index dc048d2c49..f795d3abbc 100644
--- a/api/storage_service.cc
+++ b/api/storage_service.cc
@@ -380,8 +380,9 @@ void set_storage_service(http_context& ctx, routes& r) {
     });
 
     ss::stop_rpc_server.set(r, [](std::unique_ptr<request> req) {
-        //TBD
-        return make_ready_future<json::json_return_type>(json_void());
+        return service::get_local_storage_service().stop_rpc_server().then([] {
+            return make_ready_future<json::json_return_type>(json_void());
+        });
     });
 
     ss::start_rpc_server.set(r, [](std::unique_ptr<request> req) {