diff --git a/src/matrix/room/Room.js b/src/matrix/room/Room.js
index debf6755..32434b62 100644
--- a/src/matrix/room/Room.js
+++ b/src/matrix/room/Room.js
@@ -22,7 +22,7 @@ import {Timeline} from "./timeline/Timeline.js";
 import {FragmentIdComparer} from "./timeline/FragmentIdComparer.js";
 import {SendQueue} from "./sending/SendQueue.js";
 import {WrappedError} from "../error.js"
-import {RoomMember} from "./RoomMember.js";
+import {RoomMember} from "./members/RoomMember.js";
 
 export class Room extends EventEmitter {
 	constructor({roomId, storage, hsApi, emitCollectionChange, sendScheduler, pendingEvents, user}) {
diff --git a/src/matrix/room/RoomMember.js b/src/matrix/room/members/RoomMember.js
similarity index 95%
rename from src/matrix/room/RoomMember.js
rename to src/matrix/room/members/RoomMember.js
index 7ac0141d..067c6478 100644
--- a/src/matrix/room/RoomMember.js
+++ b/src/matrix/room/members/RoomMember.js
@@ -7,7 +7,7 @@ export class RoomMember {
 
     static fromMemberEvent(roomId, memberEvent) {
         const userId = memberEvent && memberEvent.state_key;
-        if (!userId) {
+        if (typeof userId !== "string") {
             return;
         }
         const {content} = memberEvent;
diff --git a/src/matrix/room/timeline/persistence/SyncWriter.js b/src/matrix/room/timeline/persistence/SyncWriter.js
index dff28118..6667cc5f 100644
--- a/src/matrix/room/timeline/persistence/SyncWriter.js
+++ b/src/matrix/room/timeline/persistence/SyncWriter.js
@@ -18,7 +18,7 @@ import {EventKey} from "../EventKey.js";
 import {EventEntry} from "../entries/EventEntry.js";
 import {FragmentBoundaryEntry} from "../entries/FragmentBoundaryEntry.js";
 import {createEventEntry} from "./common.js";
-import {RoomMember, EVENT_TYPE as MEMBER_EVENT_TYPE} from "../../RoomMember.js";
+import {RoomMember, EVENT_TYPE as MEMBER_EVENT_TYPE} from "../../members/RoomMember.js";
 
 // Synapse bug? where the m.room.create event appears twice in sync response
 // when first syncing the room
diff --git a/src/matrix/storage/idb/schema.js b/src/matrix/storage/idb/schema.js
index 011f1e02..21a108c8 100644
--- a/src/matrix/storage/idb/schema.js
+++ b/src/matrix/storage/idb/schema.js
@@ -1,5 +1,5 @@
 import {iterateCursor} from "./utils.js";
-import {RoomMember, EVENT_TYPE as MEMBER_EVENT_TYPE} from "../../room/RoomMember.js";
+import {RoomMember, EVENT_TYPE as MEMBER_EVENT_TYPE} from "../../room/members/RoomMember.js";
 import {RoomMemberStore} from "./stores/RoomMemberStore.js";
 
 // FUNCTIONS SHOULD ONLY BE APPENDED!!