diff --git a/src/api/client/sync/v3.rs b/src/api/client/sync/v3.rs
index 12731ff6..24930941 100644
--- a/src/api/client/sync/v3.rs
+++ b/src/api/client/sync/v3.rs
@@ -15,6 +15,7 @@ use conduwuit::{
 	result::FlatOk,
 	utils::{
 		self, BoolExt, IterStream, ReadyExt, TryFutureExtExt,
+		future::OptionStream,
 		math::ruma_from_u64,
 		stream::{BroadbandExt, Tools, TryExpect, WidebandExt},
 	},
@@ -1036,7 +1037,7 @@ async fn calculate_state_incremental<'a>(
 		})
 		.into();
 
-	let state_diff: OptionFuture<_> = (!full_state && state_changed)
+	let state_diff_ids: OptionFuture<_> = (!full_state && state_changed)
 		.then(|| {
 			StreamExt::into_future(
 				services
@@ -1061,45 +1062,9 @@ async fn calculate_state_incremental<'a>(
 		})
 		.into();
 
-	let lazy_state_ids = lazy_state_ids
-		.map(|opt| {
-			opt.map(|(curr, next)| {
-				let opt = curr;
-				let iter = Option::into_iter(opt);
-				IterStream::stream(iter).chain(next)
-			})
-		})
-		.map(Option::into_iter)
-		.map(IterStream::stream)
-		.flatten_stream()
-		.flatten();
-
-	let state_diff_ids = state_diff
-		.map(|opt| {
-			opt.map(|(curr, next)| {
-				let opt = curr;
-				let iter = Option::into_iter(opt);
-				IterStream::stream(iter).chain(next)
-			})
-		})
-		.map(Option::into_iter)
-		.map(IterStream::stream)
-		.flatten_stream()
-		.flatten();
-
 	let state_events = current_state_ids
-		.map(|opt| {
-			opt.map(|(curr, next)| {
-				let opt = curr;
-				let iter = Option::into_iter(opt);
-				IterStream::stream(iter).chain(next)
-			})
-		})
-		.map(Option::into_iter)
-		.map(IterStream::stream)
-		.flatten_stream()
-		.flatten()
-		.chain(state_diff_ids)
+		.stream()
+		.chain(state_diff_ids.stream())
 		.broad_filter_map(|(shortstatekey, shorteventid)| async move {
 			if witness.is_none() || encrypted_room {
 				return Some(shorteventid);
@@ -1107,7 +1072,7 @@ async fn calculate_state_incremental<'a>(
 
 			lazy_filter(services, sender_user, shortstatekey, shorteventid).await
 		})
-		.chain(lazy_state_ids)
+		.chain(lazy_state_ids.stream())
 		.broad_filter_map(|shorteventid| {
 			services
 				.rooms
diff --git a/src/core/utils/future/mod.rs b/src/core/utils/future/mod.rs
index e1d96941..4edd0102 100644
--- a/src/core/utils/future/mod.rs
+++ b/src/core/utils/future/mod.rs
@@ -1,9 +1,11 @@
 mod bool_ext;
 mod ext_ext;
 mod option_ext;
+mod option_stream;
 mod try_ext_ext;
 
 pub use bool_ext::{BoolExt, and, or};
 pub use ext_ext::ExtExt;
 pub use option_ext::OptionExt;
+pub use option_stream::OptionStream;
 pub use try_ext_ext::TryExtExt;
diff --git a/src/core/utils/future/option_ext.rs b/src/core/utils/future/option_ext.rs
index d553e5dc..920dd044 100644
--- a/src/core/utils/future/option_ext.rs
+++ b/src/core/utils/future/option_ext.rs
@@ -11,11 +11,14 @@ pub trait OptionExt<T> {
 impl<T, Fut> OptionExt<T> for OptionFuture<Fut>
 where
 	Fut: Future<Output = T> + Send,
+	T: Send,
 {
+	#[inline]
 	fn is_none_or(self, f: impl FnOnce(&T) -> bool + Send) -> impl Future<Output = bool> + Send {
 		self.map(|o| o.as_ref().is_none_or(f))
 	}
 
+	#[inline]
 	fn is_some_and(self, f: impl FnOnce(&T) -> bool + Send) -> impl Future<Output = bool> + Send {
 		self.map(|o| o.as_ref().is_some_and(f))
 	}
diff --git a/src/core/utils/future/option_stream.rs b/src/core/utils/future/option_stream.rs
new file mode 100644
index 00000000..81130c87
--- /dev/null
+++ b/src/core/utils/future/option_stream.rs
@@ -0,0 +1,25 @@
+use futures::{Future, FutureExt, Stream, StreamExt, future::OptionFuture};
+
+use super::super::IterStream;
+
+pub trait OptionStream<T> {
+	fn stream(self) -> impl Stream<Item = T> + Send;
+}
+
+impl<T, O, S, Fut> OptionStream<T> for OptionFuture<Fut>
+where
+	Fut: Future<Output = (O, S)> + Send,
+	S: Stream<Item = T> + Send,
+	O: IntoIterator<Item = T> + Send,
+	<O as IntoIterator>::IntoIter: Send,
+	T: Send,
+{
+	#[inline]
+	fn stream(self) -> impl Stream<Item = T> + Send {
+		self.map(|opt| opt.map(|(curr, next)| curr.into_iter().stream().chain(next)))
+			.map(Option::into_iter)
+			.map(IterStream::stream)
+			.flatten_stream()
+			.flatten()
+	}
+}