diff --git a/app/definitions/INotification.ts b/app/definitions/INotification.ts
index 77467d9d7..4974b0c91 100644
--- a/app/definitions/INotification.ts
+++ b/app/definitions/INotification.ts
@@ -9,4 +9,5 @@ export interface INotification {
 	from: string;
 	image: string;
 	soundname: string;
+	getData: () => INotification;
 }
diff --git a/app/notifications/push/index.ts b/app/notifications/push/index.ts
index af25c9eed..09fa86027 100644
--- a/app/notifications/push/index.ts
+++ b/app/notifications/push/index.ts
@@ -16,9 +16,10 @@ interface IEjson {
 	messageId: string;
 }
 
-export const onNotification = (notification: INotification): void => {
-	if (notification) {
+export const onNotification = (push: INotification): void => {
+	if (push) {
 		try {
+			const notification = push?.getData();
 			const { rid, name, sender, type, host, messageType, messageId }: IEjson = EJSON.parse(notification.ejson);
 
 			const types: Record<string, string> = {
diff --git a/app/notifications/push/push.ios.ts b/app/notifications/push/push.ios.ts
index 92c2d3a6c..a6b1118c5 100644
--- a/app/notifications/push/push.ios.ts
+++ b/app/notifications/push/push.ios.ts
@@ -22,7 +22,7 @@ class PushNotification {
 			// TODO REDUX MIGRATION TO TS
 			const { background } = reduxStore.getState().app;
 			if (background) {
-				this.onNotification(notification?.getData());
+				this.onNotification(notification);
 			}
 			completion();
 		});
diff --git a/app/notifications/push/push.ts b/app/notifications/push/push.ts
index 16aa8cf5c..11eccbcb5 100644
--- a/app/notifications/push/push.ts
+++ b/app/notifications/push/push.ts
@@ -16,7 +16,7 @@ class PushNotification {
 		});
 
 		NotificationsAndroid.setNotificationOpenedListener((notification: Notification) => {
-			this.onNotification(notification?.getData());
+			this.onNotification(notification);
 		});
 	}
 
diff --git a/app/utils/room.ts b/app/utils/room.ts
index 3e4e0ef44..d39e40490 100644
--- a/app/utils/room.ts
+++ b/app/utils/room.ts
@@ -60,6 +60,6 @@ export const getBadgeColor = ({
 };
 
 export const makeThreadName = (messageRecord: { id?: string; msg?: string; attachments?: IAttachment[] }): string | undefined =>
-	messageRecord.msg || messageRecord.attachments![0].title;
+	messageRecord.msg || messageRecord?.attachments?.[0]?.title;
 
 export const isTeamRoom = ({ teamId, joined }: { teamId: string; joined: boolean }): boolean => !!teamId && joined;
diff --git a/app/views/ThreadMessagesView/index.tsx b/app/views/ThreadMessagesView/index.tsx
index db2f192b0..bce1f7c8b 100644
--- a/app/views/ThreadMessagesView/index.tsx
+++ b/app/views/ThreadMessagesView/index.tsx
@@ -290,7 +290,7 @@ class ThreadMessagesView extends React.Component<IThreadMessagesViewProps, IThre
 			if (update && update.length) {
 				update = update.map(m => buildMessage(m));
 				// filter threads
-				threadsToCreate = update.filter(i1 => allThreadsRecords.find((i2: { id: string }) => i1._id === i2.id));
+				threadsToCreate = update.filter(i1 => !allThreadsRecords.find((i2: { id: string }) => i1._id === i2.id));
 				threadsToUpdate = allThreadsRecords.filter((i1: { id: string }) => update.find(i2 => i1.id === i2._id));
 				threadsToCreate = threadsToCreate.map(thread =>
 					threadsCollection.prepareCreate(