diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index b33b5098b7..37d937d6f5 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -272,7 +272,7 @@ export default class MessageComposerInput extends React.Component {
             break;
 
             case 'quote': {
-                let {event: {content: {body, formatted_body}}} = payload.event || {};
+                let {body, formatted_body} = payload.event.getContent();
                 formatted_body = formatted_body || escape(body);
                 if (formatted_body) {
                     let content = RichText.HTMLtoContentState(`<blockquote>${formatted_body}</blockquote>`);