diff --git a/crates/matrix-sdk-indexeddb/Cargo.toml b/crates/matrix-sdk-indexeddb/Cargo.toml
index 796c38209..8cdfd88ec 100644
--- a/crates/matrix-sdk-indexeddb/Cargo.toml
+++ b/crates/matrix-sdk-indexeddb/Cargo.toml
@@ -15,10 +15,13 @@ rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
 
 [features]
 default = ["e2e-encryption", "state-store", "event-cache-store", "media-store"]
-event-cache-store = ["dep:matrix-sdk-base", "media-store"]
-media-store = ["dep:matrix-sdk-base"]
-state-store = ["dep:matrix-sdk-base", "growable-bloom-filter"]
-e2e-encryption = ["dep:matrix-sdk-base", "dep:matrix-sdk-crypto"]
+event-cache-store = ["dep:matrix-sdk-base", "media-store", "indexed-type-serializer"]
+media-store = ["dep:matrix-sdk-base", "indexed-type-serializer"]
+state-store = ["dep:matrix-sdk-base", "growable-bloom-filter", "safe-encode-traits"]
+e2e-encryption = ["dep:matrix-sdk-base", "dep:matrix-sdk-crypto", "safe-encode-serializer"]
+safe-encode-traits = []
+safe-encode-serializer = ["dep:matrix-sdk-crypto", "safe-encode-traits"]
+indexed-type-serializer = ["safe-encode-serializer"]
 testing = ["matrix-sdk-crypto?/testing"]
 experimental-encrypted-state-events = [
     "matrix-sdk-crypto?/experimental-encrypted-state-events"
diff --git a/crates/matrix-sdk-indexeddb/src/serializer/mod.rs b/crates/matrix-sdk-indexeddb/src/serializer/mod.rs
index 573e2329c..17a205ba1 100644
--- a/crates/matrix-sdk-indexeddb/src/serializer/mod.rs
+++ b/crates/matrix-sdk-indexeddb/src/serializer/mod.rs
@@ -15,10 +15,7 @@
 #[cfg(feature = "e2e-encryption")]
 pub mod foreign;
 
-#[cfg(all(
-    feature = "e2e-encryption",
-    any(feature = "event-cache-store", feature = "media-store")
-))]
+#[cfg(feature = "indexed-type-serializer")]
 pub mod indexed_type;
 #[cfg(all(
     feature = "e2e-encryption",
@@ -37,6 +34,7 @@ pub use indexed_type::{
     IndexedTypeSerializer,
 };
 
+#[cfg(any(feature = "safe-encode-traits", feature = "safe-encode-serializer"))]
 pub mod safe_encode;
 #[cfg(feature = "e2e-encryption")]
 pub use safe_encode::types::{MaybeEncrypted, SafeEncodeSerializer, SafeEncodeSerializerError};
diff --git a/crates/matrix-sdk-indexeddb/src/serializer/safe_encode/mod.rs b/crates/matrix-sdk-indexeddb/src/serializer/safe_encode/mod.rs
index 669b2306d..3179ce864 100644
--- a/crates/matrix-sdk-indexeddb/src/serializer/safe_encode/mod.rs
+++ b/crates/matrix-sdk-indexeddb/src/serializer/safe_encode/mod.rs
@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#[cfg(feature = "safe-encode-traits")]
 pub mod traits;
 
-#[cfg(feature = "e2e-encryption")]
+#[cfg(feature = "safe-encode-serializer")]
 pub mod types;