diff --git a/cpp-client/deephaven/dhclient/src/impl/table_handle_impl.cc b/cpp-client/deephaven/dhclient/src/impl/table_handle_impl.cc
index a704a1c1367..81b9f59925c 100644
--- a/cpp-client/deephaven/dhclient/src/impl/table_handle_impl.cc
+++ b/cpp-client/deephaven/dhclient/src/impl/table_handle_impl.cc
@@ -715,7 +715,7 @@ std::shared_ptr<Schema> TableHandleImpl::Schema() {
   std::unique_lock guard(mutex_);
   if (schema_request_sent_) {
     // Schema request already sent by someone else. So wait for the successful result or error.
-    mutex_.unlock();
+    guard.unlock();
     return schema_future_.get();
   }
 
diff --git a/cpp-client/deephaven/dhclient/src/server/server.cc b/cpp-client/deephaven/dhclient/src/server/server.cc
index a7d499470e6..4ee76699def 100644
--- a/cpp-client/deephaven/dhclient/src/server/server.cc
+++ b/cpp-client/deephaven/dhclient/src/server/server.cc
@@ -362,7 +362,6 @@ void Server::SendRpc(const std::function<grpc::Status(grpc::ClientContext *)> &c
       const char *message = "Server cancelled. All further RPCs are being rejected";
       throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
     }
-    guard.unlock();
   }
 
   auto status = callback(&ctx);