diff --git a/bun.lock b/bun.lock
index 0a6f88c8..bcaabd7d 100644
--- a/bun.lock
+++ b/bun.lock
@@ -1,5 +1,6 @@
 {
   "lockfileVersion": 1,
+  "configVersion": 0,
   "workspaces": {
     "": {
       "name": "homeserver",
diff --git a/packages/federation-sdk/src/services/federation.service.ts b/packages/federation-sdk/src/services/federation.service.ts
index fc7e7f86..b1d14191 100644
--- a/packages/federation-sdk/src/services/federation.service.ts
+++ b/packages/federation-sdk/src/services/federation.service.ts
@@ -313,9 +313,9 @@ export class FederationService {
 		}
 
 		for (const server of servers) {
-			if (server === event.origin) {
+			if (server === event.senderDomain) {
 				this.logger.info(
-					`Skipping transaction to event origin: ${event.origin}`,
+					`Skipping transaction to event origin: ${event.senderDomain}`,
 				);
 				continue;
 			}
diff --git a/packages/federation-sdk/src/services/room.service.ts b/packages/federation-sdk/src/services/room.service.ts
index cdc32066..debcd2c5 100644
--- a/packages/federation-sdk/src/services/room.service.ts
+++ b/packages/federation-sdk/src/services/room.service.ts
@@ -1112,7 +1112,7 @@ export class RoomService {
 
 		// try to persist the join event now, should succeed with state in place
 		void this.eventService.processIncomingPDUs(
-			residentServer || joinEventFinal.origin,
+			residentServer,
 			[...state, joinEventFinal.event],
 		);
 
diff --git a/packages/room/src/authorizartion-rules/rules.ts b/packages/room/src/authorizartion-rules/rules.ts
index 16d84f3b..5a94d45e 100644
--- a/packages/room/src/authorizartion-rules/rules.ts
+++ b/packages/room/src/authorizartion-rules/rules.ts
@@ -83,7 +83,7 @@ function isRoomAliasAllowed(
 	}
 
 	// If sender’s domain doesn’t matches state_key, reject.
-	if (roomAliasEvent.origin !== roomAliasEvent.stateKey) {
+	if (roomAliasEvent.senderDomain !== roomAliasEvent.stateKey) {
 		throw new StateResolverAuthorizationError(RejectCodes.AuthError, {
 			rejectedEvent: roomAliasEvent,
 			reason:
@@ -799,7 +799,7 @@ export async function checkEventAuthWithState(
 	// If the content of the m.room.create event in the room state has the property m.federate set to false, and the sender domain of the event does not match the sender domain of the create event, reject.
 	if (
 		roomCreateEvent.getContent()['m.federate'] === false &&
-		event.origin !== roomCreateEvent.origin
+		event.senderDomain !== roomCreateEvent.senderDomain
 	) {
 		throw new StateResolverAuthorizationError(RejectCodes.AuthError, {
 			rejectedEvent: event,
diff --git a/packages/room/src/manager/event-wrapper.ts b/packages/room/src/manager/event-wrapper.ts
index d24c7654..3190ef9b 100644
--- a/packages/room/src/manager/event-wrapper.ts
+++ b/packages/room/src/manager/event-wrapper.ts
@@ -72,6 +72,13 @@ export abstract class PersistentEventBase<
 	private authEventsIds: Set<EventID> = new Set();
 	private prevEventsIds: Set<EventID> = new Set();
 
+	/**
+	 * The origin server that created this event.
+	 * This is metadata stored separately from the PDU and is used to track
+	 * which server the event came from in federation scenarios.
+	 */
+	public eventOrigin?: string;
+
 	constructor(
 		event: PduWithHashesAndSignaturesOptional,
 		public readonly version: Version,
@@ -118,13 +125,15 @@ export abstract class PersistentEventBase<
 
 	// TODO: This should be removed or different name used instead?
 
-	get origin() {
-		const domain = extractDomainFromId(this.rawEvent.sender);
-		if (!domain) {
-			throw new Error('Invalid sender, no domain found');
-		}
-		return domain;
-	}
+	/**
+     * Gets the domain of the sender from their ID.
+     * @returns {string} The sender's domain.
+     * @throws {Error} If the sender ID is invalid or has no domain.
+     */
+    get senderDomain() {
+        const domain = extractDomainFromId(this.rawEvent.sender);
+        return domain;
+    }
 
 	get residentServer() {
 		const residentServer = extractDomainFromId(this.rawEvent.room_id);
@@ -142,6 +151,15 @@ export abstract class PersistentEventBase<
 		return this.rawEvent.origin_server_ts;
 	}
 
+	/**
+	 * Gets the origin server that created this event.
+	 * This is the server identity where the event originated (from federation).
+	 * @returns {string | undefined} The origin server name, or undefined if not set.
+	 */
+	get origin() {
+		return this.eventOrigin;
+	}
+
 	// if we are accessing the inner event, the event itself should be frozen immediately to not change the reference hash any longer, affecting the id
 	// if anywhere the code still tries to, we will throw an error, which is why "lock" isn't just a flag in the class.
 	get event(): Readonly<PduForType<Type>> {
diff --git a/packages/room/src/manager/room-state.ts b/packages/room/src/manager/room-state.ts
index e7107ef8..31283e3a 100644
--- a/packages/room/src/manager/room-state.ts
+++ b/packages/room/src/manager/room-state.ts
@@ -108,8 +108,7 @@ export class RoomState {
 
 		return topicEvent.getContent().topic;
 	}
-
-	// origin is the origin of the room gotten from the room id
+	// origin is the domain of the room creator (sender of m.room.create event)
 	get origin() {
 		const createEvent = getStateByMapKey(this.stateMap, {
 			type: 'm.room.create',
@@ -119,12 +118,7 @@ export class RoomState {
 			throw new Error('Room create event not found');
 		}
 
-		const origin = createEvent.origin;
-		if (!origin) {
-			throw new Error('Room create event has no origin');
-		}
-
-		return origin;
+		return createEvent.senderDomain;
 	}
 
 	get powerLevels() {