diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index b4735ce0a3..cb6250c2d3 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -914,14 +914,12 @@ module.exports = React.createClass({
             return;
         }
 
-        ContentMessages.sendContentToRoom(
-            file, this.state.room.roomId, MatrixClientPeg.get(),
-        ).done(() => {
+        ContentMessages.sendContentToRoom(file, this.state.room.roomId, MatrixClientPeg.get()).then(() => {
             // Send message_sent callback, for things like _checkIfAlone because after all a file is still a message.
             dis.dispatch({
                 action: 'message_sent',
             });
-        }, (error) => {
+        }).catch((error) => {
             if (error.name === "UnknownDeviceError") {
                 // Let the status bar handle this
                 return;
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index f7c4215d88..97e8780f0f 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -877,11 +877,13 @@ export default class MessageComposerInput extends React.Component {
         }
 
 
-        this.client.sendMessage(this.props.room.roomId, content).done((res) => {
+        this.client.sendMessage(this.props.room.roomId, content).then((res) => {
             dis.dispatch({
                 action: 'message_sent',
             });
-        }, (e) => onSendMessageFailed(e, this.props.room));
+        }).catch((e) => {
+            onSendMessageFailed(e, this.props.room);
+        });
 
         this.setState({
             editorState: this.createEditorState(),