diff --git a/lix/libstore/remote-store.cc b/lix/libstore/remote-store.cc
index f7c6b7a1c..7600679d4 100644
--- a/lix/libstore/remote-store.cc
+++ b/lix/libstore/remote-store.cc
@@ -359,8 +359,7 @@ kj::Promise<Result<ref<const ValidPathInfo>>> RemoteStore::addCAToStore(
     const StorePathSet & references,
     RepairFlag repair)
 try {
-    std::optional<ConnectionHandle> conn_(TRY_AWAIT(getConnection()));
-    auto & conn = *conn_;
+    auto conn(TRY_AWAIT(getConnection()));
 
     conn->to
         << WorkerProto::Op::AddToStore
@@ -523,8 +522,7 @@ kj::Promise<Result<std::vector<KeyedBuildResult>>> RemoteStore::buildPathsWithRe
 try {
     TRY_AWAIT(copyDrvsFromEvalStore(paths, evalStore));
 
-    std::optional<ConnectionHandle> conn_(TRY_AWAIT(getConnection()));
-    auto & conn = *conn_;
+    auto conn(TRY_AWAIT(getConnection()));
 
     conn->to << WorkerProto::Op::BuildPathsWithResults;
     conn->to << WorkerProto::write(*this, *conn, paths);