diff --git a/bindings/matrix-sdk-ffi/CHANGELOG.md b/bindings/matrix-sdk-ffi/CHANGELOG.md
index 996921bdf1..619f742511 100644
--- a/bindings/matrix-sdk-ffi/CHANGELOG.md
+++ b/bindings/matrix-sdk-ffi/CHANGELOG.md
@@ -2,10 +2,14 @@
 
 Breaking changes:
 
-- `EventSendState` now has two additional variants: `VerifiedUserHasUnsignedDevice` and
-  `VerifiedUserChangedIdentity`. These reflect problems with verified users in the room
-  and as such can only be returned when the room key recipient strategy has
-  `error_on_verified_user_problem` set.
+- `EventSendState` now has four additional variants: `VerifiedUserHasUnsignedDevice`,
+  `VerifiedUserChangedIdentity`, `CrossSigningNotSetup`, and
+  `SendingFromUnverifiedDevice`. The first two reflect problems with verified users in
+  the room and as such can only be returned when the room key recipient strategy has
+  `error_on_verified_user_problem` set, or when using the identity-based strategy. The
+  last two indicate that your own device is not properly cross-signed, which is a
+  requirement when using the identity-based strategy, and can only be returned when
+  using the identity-based strategy.
 
 - The `AuthenticationService` has been removed:
     - Instead of calling `configure_homeserver`, build your own client with the `serverNameOrHomeserverUrl` builder
diff --git a/crates/matrix-sdk-crypto/CHANGELOG.md b/crates/matrix-sdk-crypto/CHANGELOG.md
index a463ee92a2..96804cef64 100644
--- a/crates/matrix-sdk-crypto/CHANGELOG.md
+++ b/crates/matrix-sdk-crypto/CHANGELOG.md
@@ -56,6 +56,11 @@ Breaking changes:
   `OlmMachine::share_room_key` to fail with an error if any verified users on
   the recipient list have unsigned devices, or are no lonver verified.
 
+  When `CallectStrategy::IdentityBasedStrategy` is used,
+  `OlmMachine::share_room_key` will fail with an error if any verified users on
+  the recipient list are no longer verified, or if our own device is not
+  properly cross-signed.
+
   Also remove `CollectStrategy::new_device_based`: callers should construct a
   `CollectStrategy::DeviceBasedStrategy` directly.
 
@@ -63,6 +68,7 @@ Breaking changes:
   a list of booleans.
   ([#3810](https://github.com/matrix-org/matrix-rust-sdk/pull/3810))
   ([#3816](https://github.com/matrix-org/matrix-rust-sdk/pull/3816))
+  ([#3896](https://github.com/matrix-org/matrix-rust-sdk/pull/3896))
 
 - Remove the method `OlmMachine::clear_crypto_cache()`, crypto stores are not
   supposed to have any caches anymore.