diff --git a/ocaml/database/dune b/ocaml/database/dune
index db4b431749f..6ffdbbd298e 100644
--- a/ocaml/database/dune
+++ b/ocaml/database/dune
@@ -36,6 +36,7 @@
     rpclib.core
     rpclib.json
     safe-resources
+    polly
     stunnel
     threads.posix
     http_lib
diff --git a/ocaml/database/master_connection.ml b/ocaml/database/master_connection.ml
index 2547ae53182..341b9aaee2d 100644
--- a/ocaml/database/master_connection.ml
+++ b/ocaml/database/master_connection.ml
@@ -171,7 +171,10 @@ let open_secure_connection () =
     ~write_to_log:(fun x -> debug "stunnel: %s\n" x)
     ~verify_cert host port
   @@ fun st_proc ->
-  let fd_closed = Thread.wait_timed_read Unixfd.(!(st_proc.Stunnel.fd)) 5. in
+  let polly = Polly.create () in
+  let finally () = Polly.close polly in
+  Fun.protect ~finally @@ fun () ->
+  let fd_closed = Polly.wait polly 1 5000 (fun _ _ _ -> ()) > 0 in
   let proc_quit =
     try
       Unix.kill (Stunnel.getpid st_proc.Stunnel.pid) 0 ;