diff --git a/Cargo.lock b/Cargo.lock
index e3c1857dd..a98839a9e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2169,7 +2169,7 @@ dependencies = [
 [[package]]
 name = "rpki"
 version = "0.18.4"
-source = "git+https://github.com/NLnetLabs/rpki-rs.git#575a321ac884410a45f203d1d18336cb3ac97d18"
+source = "git+https://github.com/NLnetLabs/rpki-rs.git?branch=compat-handle#6a0f7e3d9cd000c0ed887f2f9edcfd568e84b089"
 dependencies = [
  "base64 0.22.1",
  "bcder",
diff --git a/Cargo.toml b/Cargo.toml
index a490789a4..40ed2692f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,7 +52,7 @@ rand            = "0.8"
 regex           = { version = "1.5.5", optional = true, default-features = false, features = [ "std" ] }
 reqwest         = { version = "0.12.5", features = ["json"] }
 rpassword       = { version = "7.3.1", optional = true }
-rpki            = { version = "0.18.4", features = ["ca", "compat", "rrdp"], git = "https://github.com/NLnetLabs/rpki-rs.git" }
+rpki            = { version = "0.18.4", features = ["ca", "compat", "rrdp"], git = "https://github.com/NLnetLabs/rpki-rs.git", branch = "compat-handle" }
 rustls-pemfile  = "2.1.2"
 scrypt          = { version = "0.11", optional = true, default-features = false }
 secrecy         = { version = "0.8", features = ["serde"] }