diff --git a/Sources/ComposableArchitecture/Core.swift b/Sources/ComposableArchitecture/Core.swift
index f853848df963..b50119322fb0 100644
--- a/Sources/ComposableArchitecture/Core.swift
+++ b/Sources/ComposableArchitecture/Core.swift
@@ -205,7 +205,7 @@ final class ScopedCore<Base: Core, State, Action>: Core {
   let stateKeyPath: KeyPath<Base.State, State>
   let actionKeyPath: CaseKeyPath<Base.Action, Action>
   #if DEBUG
-    let isInPerceptionTracking = _PerceptionLocals.isInPerceptionTracking
+    let initializedInPerceptionTracking = _isInPerceptionTracking
   #endif
   init(
     base: Base,
@@ -220,7 +220,9 @@ final class ScopedCore<Base: Core, State, Action>: Core {
   @inline(__always)
   var state: State {
     #if DEBUG
-      return _PerceptionLocals.$skipPerceptionChecking.withValue(isInPerceptionTracking) {
+      return _PerceptionLocals.$skipPerceptionChecking.withValue(
+        initializedInPerceptionTracking || _isInPerceptionTracking
+      ) {
         base.state[keyPath: stateKeyPath]
       }
     #else
diff --git a/Sources/ComposableArchitecture/Observation/IdentifiedArray+Observation.swift b/Sources/ComposableArchitecture/Observation/IdentifiedArray+Observation.swift
index eafff521fe4c..70a39c3baa24 100644
--- a/Sources/ComposableArchitecture/Observation/IdentifiedArray+Observation.swift
+++ b/Sources/ComposableArchitecture/Observation/IdentifiedArray+Observation.swift
@@ -92,7 +92,7 @@ extension Store where State: ObservableState {
 public struct _StoreCollection<ID: Hashable & Sendable, State, Action>: RandomAccessCollection {
   private let store: Store<IdentifiedArray<ID, State>, IdentifiedAction<ID, Action>>
   private let data: IdentifiedArray<ID, State>
-  private let isInPerceptionTracking = _isInPerceptionTracking
+  private let initializedInPerceptionTracking = _isInPerceptionTracking
 
   #if swift(<5.10)
     @MainActor(unsafe)
@@ -146,7 +146,9 @@ public struct _StoreCollection<ID: Hashable & Sendable, State, Action>: RandomAc
         return child
       }
       #if DEBUG
-        return _PerceptionLocals.$isInPerceptionTracking.withValue(self.isInPerceptionTracking) {
+        return _PerceptionLocals.$isInPerceptionTracking.withValue(
+          self.initializedInPerceptionTracking || _isInPerceptionTracking
+        ) {
           child
         }
       #else
diff --git a/Sources/ComposableArchitecture/Store.swift b/Sources/ComposableArchitecture/Store.swift
index 9e15b0060418..5a9f9ed230a8 100644
--- a/Sources/ComposableArchitecture/Store.swift
+++ b/Sources/ComposableArchitecture/Store.swift
@@ -336,7 +336,7 @@ public final class Store<State, Action>: _Store {
       func subscribeToDidSet<T: ObservableState>(_ type: T.Type) -> AnyCancellable {
         return core.didSet
           .prefix { [weak self] _ in self?.core.isInvalid == false }
-          .compactMap { [weak self] in (self?.currentState as? T)?._$id }
+          .compactMap { [weak self] in (self?.withState(\.self) as? T)?._$id }
           .removeDuplicates()
           .dropFirst()
           .sink { [weak self, weak parent] _ in