diff --git a/matrix_sdk_base/src/client.rs b/matrix_sdk_base/src/client.rs
index 2932bd90..0550b9a7 100644
--- a/matrix_sdk_base/src/client.rs
+++ b/matrix_sdk_base/src/client.rs
@@ -732,6 +732,8 @@ impl BaseClient {
                         if self.receive_joined_state_event(&room_id, &e).await {
                             updated = true;
                         }
+                        self.emit_state_event(&room_id, &e, RoomStateType::Joined)
+                            .await;
                     }
                 }
 
@@ -764,14 +766,6 @@ impl BaseClient {
                 .await
                 .set_unread_notice_count(&joined_room.unread_notifications);
 
-            // re looping is not ideal here
-            for event in &mut joined_room.state.events {
-                if let Ok(e) = event.deserialize() {
-                    self.emit_state_event(&room_id, &e, RoomStateType::Joined)
-                        .await;
-                }
-            }
-
             for mut event in &mut joined_room.timeline.events {
                 let decrypted_event = {
                     let (decrypt_ev, timeline_update) = self