diff --git a/app/lib/methods/subscriptions/room.js b/app/lib/methods/subscriptions/room.js
index db3c16b57..b30e63efa 100644
--- a/app/lib/methods/subscriptions/room.js
+++ b/app/lib/methods/subscriptions/room.js
@@ -184,6 +184,10 @@ export default function subscribeRoom({ rid }) {
 				typingTimeouts[key] = null;
 			}
 		});
+		database.memoryDatabase.write(() => {
+			const usersTyping = database.memoryDatabase.objects('usersTyping').filtered('rid == $0', rid);
+			database.memoryDatabase.delete(usersTyping);
+		});
 	};
 
 	connectedListener = this.sdk.onStreamData('connected', handleConnected);