diff --git a/reactive_stores/src/subfield.rs b/reactive_stores/src/subfield.rs
index d1a496950..01f56c46c 100644
--- a/reactive_stores/src/subfield.rs
+++ b/reactive_stores/src/subfield.rs
@@ -80,7 +80,7 @@ where
 {
     type Value = T;
     type Reader = Mapped<Inner::Reader, T>;
-    type Writer = MappedMut<WriteGuard<ArcTrigger, Inner::UntrackedWriter>, T>;
+    type Writer = MappedMut<WriteGuard<ArcTrigger, Inner::Writer>, T>;
     type UntrackedWriter =
         MappedMut<WriteGuard<ArcTrigger, Inner::UntrackedWriter>, T>;
 
@@ -102,14 +102,14 @@ where
 
     fn writer(&self) -> Option<Self::Writer> {
         let trigger = self.get_trigger(self.path().into_iter().collect());
-        let inner = WriteGuard::new(trigger, self.inner.untracked_writer()?);
+        let inner = WriteGuard::new(trigger, self.inner.writer()?);
         Some(MappedMut::new(inner, self.read, self.write))
     }
 
     fn untracked_writer(&self) -> Option<Self::UntrackedWriter> {
-        let mut guard = self.writer()?;
-        guard.untrack();
-        Some(guard)
+        let trigger = self.get_trigger(self.path().into_iter().collect());
+        let inner = WriteGuard::new(trigger, self.inner.untracked_writer()?);
+        Some(MappedMut::new(inner, self.read, self.write))
     }
 }