diff --git a/ee/packages/federation-matrix/src/FederationMatrix.ts b/ee/packages/federation-matrix/src/FederationMatrix.ts
index 03136b2775a68..fdf2a1045e921 100644
--- a/ee/packages/federation-matrix/src/FederationMatrix.ts
+++ b/ee/packages/federation-matrix/src/FederationMatrix.ts
@@ -729,18 +729,8 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
 		}
 	}
 
-	async getEventById(eventId: EventID): Promise<any | null> {
-		if (!this.homeserverServices) {
-			this.logger.warn('Homeserver services not available');
-			return null;
-		}
-
-		try {
-			return await this.homeserverServices.event.getEventById(eventId);
-		} catch (error) {
-			this.logger.error('Failed to get event by ID:', error);
-			throw error;
-		}
+	async getEventById(eventId: EventID) {
+		return this.homeserverServices.event.getEventById(eventId);
 	}
 
 	async leaveRoom(roomId: string, user: IUser): Promise<void> {
diff --git a/ee/packages/federation-matrix/src/events/message.ts b/ee/packages/federation-matrix/src/events/message.ts
index e56cdb40a2a23..e487f17b464ac 100644
--- a/ee/packages/federation-matrix/src/events/message.ts
+++ b/ee/packages/federation-matrix/src/events/message.ts
@@ -276,7 +276,7 @@ export function message(emitter: Emitter<HomeserverEventSignatures>, serverName:
 			}
 
 			const messageEvent = await FederationMatrix.getEventById(redactedEventId);
-			if (!messageEvent || messageEvent.type !== 'm.room.message') {
+			if (!messageEvent || messageEvent.event.type !== 'm.room.message') {
 				logger.debug(`Event ${redactedEventId} is not a message event`);
 				return;
 			}
diff --git a/packages/core-services/src/types/IFederationMatrixService.ts b/packages/core-services/src/types/IFederationMatrixService.ts
index 889dee75c768e..fcf0278299ebc 100644
--- a/packages/core-services/src/types/IFederationMatrixService.ts
+++ b/packages/core-services/src/types/IFederationMatrixService.ts
@@ -1,5 +1,5 @@
 import type { IMessage, IRoomFederated, IRoomNativeFederated, IUser } from '@rocket.chat/core-typings';
-import type { EventID, PduForType } from '@rocket.chat/federation-sdk';
+import type { EventID, PduForType, EventStore } from '@rocket.chat/federation-sdk';
 
 export interface IFederationMatrixService {
 	createRoom(room: IRoomFederated, owner: IUser, members: string[]): Promise<{ room_id: string; event_id: string }>;
@@ -9,7 +9,7 @@ export interface IFederationMatrixService {
 	deleteMessage(matrixRoomId: string, message: IMessage): Promise<void>;
 	sendReaction(messageId: string, reaction: string, user: IUser): Promise<void>;
 	removeReaction(messageId: string, reaction: string, user: IUser, oldMessage: IMessage): Promise<void>;
-	getEventById(eventId: string): Promise<any | null>;
+	getEventById(eventId: string): Promise<EventStore | null>;
 	leaveRoom(rid: IRoomFederated['_id'], user: IUser): Promise<void>;
 	kickUser(room: IRoomNativeFederated, removedUser: IUser, userWhoRemoved: IUser): Promise<void>;
 	updateMessage(room: IRoomNativeFederated, message: IMessage): Promise<void>;