diff --git a/steamos-manager/src/daemon/mod.rs b/steamos-manager/src/daemon/mod.rs
index f6f7411..8f0ea15 100644
--- a/steamos-manager/src/daemon/mod.rs
+++ b/steamos-manager/src/daemon/mod.rs
@@ -38,7 +38,7 @@ pub(crate) trait DaemonContext: Sized {
 
     fn user_config_path(&self) -> Result<PathBuf>;
     fn system_config_path(&self) -> Result<PathBuf>;
-    fn state(&self) -> Self::State;
+    fn state(&self) -> &Self::State;
 
     async fn start(
         &mut self,
diff --git a/steamos-manager/src/daemon/root.rs b/steamos-manager/src/daemon/root.rs
index c1ed5c6..47fcb01 100644
--- a/steamos-manager/src/daemon/root.rs
+++ b/steamos-manager/src/daemon/root.rs
@@ -111,8 +111,8 @@ impl DaemonContext for RootContext {
         Ok(path("/usr/share/steamos-manager/system.d"))
     }
 
-    fn state(&self) -> RootState {
-        self.state
+    fn state(&self) -> &RootState {
+        &self.state
     }
 
     async fn start(
diff --git a/steamos-manager/src/daemon/user.rs b/steamos-manager/src/daemon/user.rs
index 67b3b07..4824444 100644
--- a/steamos-manager/src/daemon/user.rs
+++ b/steamos-manager/src/daemon/user.rs
@@ -71,8 +71,8 @@ impl DaemonContext for UserContext {
         Ok(path("/usr/share/steamos-manager/user.d"))
     }
 
-    fn state(&self) -> UserState {
-        UserState::default()
+    fn state(&self) -> &UserState {
+        &self.state
     }
 
     async fn start(