diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 952bf452a4..2b4693646a 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -130,8 +130,8 @@ export default class BasicMessageEditor extends React.Component {
             } catch (err) {
                 console.error(err);
             }
-            // if caret is a range, take the end position
-            const position = caret.end || caret;
+            // if caret selection is a range, take the end position
+            const position = selection.end || selection;
             this._setLastCaretFromPosition(position);
         }
         if (this.props.placeholder) {