diff --git a/Examples/Integration/Integration/iOS 17/ObservableSharedStateTestCase.swift b/Examples/Integration/Integration/iOS 17/ObservableSharedStateTestCase.swift
index e4f3a1f27b44..6fbe00213323 100644
--- a/Examples/Integration/Integration/iOS 17/ObservableSharedStateTestCase.swift	
+++ b/Examples/Integration/Integration/iOS 17/ObservableSharedStateTestCase.swift	
@@ -112,12 +112,12 @@ private struct Feature {
           defaults.removeObject(forKey: "isOn")
         }
       case .resetButtonTapped:
-        state.isAppStorageOn1 = false
-        state.isAppStorageOn2 = false
-        state.fileStorage1.isOn = false
-        state.fileStorage2.isOn = false
-        state.isInMemoryOn1 = false
-        state.isInMemoryOn2 = false
+        state.$isAppStorageOn1.withLock { $0 = false }
+        state.$isAppStorageOn2.withLock { $0 = false }
+        state.$fileStorage1.withLock { $0.isOn = false }
+        state.$fileStorage2.withLock { $0.isOn = false }
+        state.$isInMemoryOn1.withLock { $0 = false }
+        state.$isInMemoryOn2.withLock { $0 = false }
         return .none
       case .writeToFileStorageButtonTapped:
         return .run { [isOn = state.fileStorage1.isOn] _ in
diff --git a/Sources/ComposableArchitecture/Store.swift b/Sources/ComposableArchitecture/Store.swift
index 590686fe8184..542869bd918d 100644
--- a/Sources/ComposableArchitecture/Store.swift
+++ b/Sources/ComposableArchitecture/Store.swift
@@ -371,7 +371,8 @@ public final class Store<State, Action> {
 
     if let stateType = State.self as? any ObservableState.Type {
       func subscribeToDidSet<T: ObservableState>(_ type: T.Type) -> AnyCancellable {
-        core.didSet
+        return core.didSet
+          .prefix { [weak self] _ in self?.core.isInvalid != true }
           .compactMap { [weak self] in (self?.currentState as? T)?._$id }
           .removeDuplicates()
           .dropFirst()
diff --git a/Tests/ComposableArchitectureTests/StorePerceptionTests.swift b/Tests/ComposableArchitectureTests/StorePerceptionTests.swift
index 9cc3081eeb61..bffa28d06251 100644
--- a/Tests/ComposableArchitectureTests/StorePerceptionTests.swift
+++ b/Tests/ComposableArchitectureTests/StorePerceptionTests.swift
@@ -32,6 +32,7 @@ final class StorePerceptionTests: BaseTCATestCase {
   }
 
   @MainActor
+  @available(*, deprecated)
   func testPerceptionCheck_AccessStateWithoutTracking() {
     @MainActor
     struct FeatureView: View {