diff --git a/services/pddb/src/lib.rs b/services/pddb/src/lib.rs
index 65d6f47ee..b53fbd16a 100644
--- a/services/pddb/src/lib.rs
+++ b/services/pddb/src/lib.rs
@@ -18,6 +18,7 @@ use std::thread::JoinHandle;
use core::sync::atomic::{AtomicU32, Ordering};
pub(crate) static REFCOUNT: AtomicU32 = AtomicU32::new(0);
pub(crate) static POLLER_REFCOUNT: AtomicU32 = AtomicU32::new(0);
+use std::cell::RefCell;
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
pub enum CbOp {
@@ -73,7 +74,8 @@ impl Drop for PddbMountPoller {
pub struct Pddb {
conn: CID,
/// a SID that we can directly share with the PDDB server for the purpose of handling key change callbacks
- cb: Option<(SID, JoinHandle::<()>)>,
+ cb: RefCell