diff --git a/lib/client.js b/lib/client.js
index eba62946c..50bec8400 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -1073,6 +1073,7 @@ function _sendEvent(client, room, event, callback) {
                     matchingEvent.event.type = event.event.type;
                 }
                 room.removeEvents([localEventId]);
+                matchingEvent.status = null; // make sure it's still marked as sent
             }
             else {
                 room.removeEvents([localEventId]);