diff --git a/eden/fs/service/EdenServer.cpp b/eden/fs/service/EdenServer.cpp
index ed95c44f14..4d0e77dac7 100644
--- a/eden/fs/service/EdenServer.cpp
+++ b/eden/fs/service/EdenServer.cpp
@@ -21,6 +21,7 @@
 #include <signal.h>
 #include <thrift/lib/cpp/concurrency/ThreadManager.h>
 #include <thrift/lib/cpp2/server/ThriftServer.h>
+#include <thrift/lib/cpp2/transport/rsocket/server/RSRoutingHandler.h>
 
 #include "common/stats/ServiceData.h"
 #include "eden/fs/config/CheckoutConfig.h"
@@ -1078,6 +1079,8 @@ Future<Unit> EdenServer::createThriftServer() {
   server_->setNumIOWorkerThreads(FLAGS_thrift_num_workers);
   server_->setEnableCodel(FLAGS_thrift_enable_codel);
   server_->setMinCompressBytes(FLAGS_thrift_min_compress_bytes);
+  server_->addRoutingHandler(
+      std::make_unique<apache::thrift::RSRoutingHandler>());
   server_->enableRocketServer(false);
 
   handler_ = make_shared<EdenServiceHandler>(this);