diff --git a/src/utils/EventUtils.js b/src/utils/EventUtils.js
index 8b219d2a03..219b53bc5e 100644
--- a/src/utils/EventUtils.js
+++ b/src/utils/EventUtils.js
@@ -46,7 +46,8 @@ export function isContentActionable(mxEvent) {
 }
 
 export function canEditContent(mxEvent) {
-    return isContentActionable(mxEvent) &&
+    return mxEvent.status !== EventStatus.CANCELLED &&
+        mxEvent.getType() === 'm.room.message' &&
         mxEvent.getOriginalContent().msgtype === "m.text" &&
         mxEvent.getSender() === MatrixClientPeg.get().getUserId();
 }