diff --git a/src/api/client_server/membership.rs b/src/api/client_server/membership.rs
index b3287aca..62985bb7 100644
--- a/src/api/client_server/membership.rs
+++ b/src/api/client_server/membership.rs
@@ -703,17 +703,13 @@ pub(crate) async fn invite_helper(
             )?;
 
             let mut invite_room_state = services().rooms.state.stripped_state(&pdu.room_id)?;
-            invite_room_state.push(
-                services()
-                    .rooms
-                    .state_accessor
-                    .room_state_get(
-                        &pdu.room_id,
-                        &StateEventType::RoomMember,
-                        sender_user.as_str())?
-                    .expect("sender is already room member")
-                    .to_stripped_state_event());
-            let invite_room_state = invite_room_state;
+            if let Some(sender) = services().rooms.state_accessor.room_state_get(
+                &pdu.room_id,
+                &StateEventType::RoomMember,
+                sender_user.as_str(),
+            )? {
+                invite_room_state.push(sender.to_stripped_state_event());
+            }
 
             drop(state_lock);