diff --git a/src/components/views/rooms/Autocomplete.tsx b/src/components/views/rooms/Autocomplete.tsx
index 1eb2be473b..d9b4268917 100644
--- a/src/components/views/rooms/Autocomplete.tsx
+++ b/src/components/views/rooms/Autocomplete.tsx
@@ -33,9 +33,9 @@ interface IProps {
     // the query string for which to show autocomplete suggestions
     query: string;
     // method invoked with range and text content when completion is confirmed
-    onConfirm: (ICompletion) => void;
+    onConfirm: (completion: ICompletion) => void;
     // method invoked when selected (if any) completion changes
-    onSelectionChange?: (ICompletion, number) => void;
+    onSelectionChange?: (partIndex: number) => void;
     selection: ISelectionRange;
     // The room in which we're autocompleting
     room: Room;
@@ -172,7 +172,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         if (anyMatches) {
             hide = false;
             if (this.props.onSelectionChange) {
-                this.props.onSelectionChange(this.state.completionList[selectionOffset - 1], selectionOffset - 1);
+                this.props.onSelectionChange(selectionOffset - 1);
             }
         }
 
@@ -258,7 +258,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
     setSelection(selectionOffset: number) {
         this.setState({selectionOffset, hide: false});
         if (this.props.onSelectionChange) {
-            this.props.onSelectionChange(this.state.completionList[selectionOffset - 1], selectionOffset - 1);
+            this.props.onSelectionChange(selectionOffset - 1);
         }
     }
 
diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx
index a2cae654f3..16332fda8f 100644
--- a/src/components/views/rooms/BasicMessageComposer.tsx
+++ b/src/components/views/rooms/BasicMessageComposer.tsx
@@ -575,10 +575,9 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         this.props.model.autoComplete.onComponentConfirm(completion);
     };
 
-    private onAutoCompleteSelectionChange = (completion: ICompletion, completionIndex: number) => {
+    private onAutoCompleteSelectionChange = (completionIndex: number) => {
         this.modifiedFlag = true;
-        // this.props.model.autoComplete.onComponentSelectionChange(completion);
-        this.setState({completionIndex});
+        this.setState({ completionIndex });
     };
 
     private configureEmoticonAutoReplace = () => {
diff --git a/src/editor/autocomplete.ts b/src/editor/autocomplete.ts
index fe09406ca1..ea943c3f2c 100644
--- a/src/editor/autocomplete.ts
+++ b/src/editor/autocomplete.ts
@@ -32,7 +32,6 @@ export type GetAutocompleterComponent = () => Autocomplete;
 export type UpdateQuery = (test: string) => Promise<void>;
 
 export default class AutocompleteWrapperModel {
-    private queryPart: Part;
     private partIndex: number;
 
     constructor(
@@ -45,10 +44,6 @@ export default class AutocompleteWrapperModel {
 
     public onEscape(e: KeyboardEvent) {
         this.getAutocompleterComponent().onEscape(e);
-        this.updateCallback({
-            replaceParts: [this.partCreator.plain(this.queryPart.text)],
-            close: true,
-        });
     }
 
     public close() {
@@ -89,25 +84,10 @@ export default class AutocompleteWrapperModel {
     }
 
     public onPartUpdate(part: Part, pos: DocumentPosition) {
-        // cache the typed value and caret here
-        // so we can restore it in onComponentSelectionChange when the value is undefined (meaning it should be the typed text)
-        this.queryPart = part;
         this.partIndex = pos.index;
         return this.updateQuery(part.text);
     }
 
-    public onComponentSelectionChange(completion: ICompletion) {
-        if (!completion) {
-            this.updateCallback({
-                replaceParts: [this.queryPart],
-            });
-        } else {
-            this.updateCallback({
-                replaceParts: this.partForCompletion(completion),
-            });
-        }
-    }
-
     public onComponentConfirm(completion: ICompletion) {
         this.updateCallback({
             replaceParts: this.partForCompletion(completion),
diff --git a/src/editor/model.ts b/src/editor/model.ts
index f1b6f90957..90765da047 100644
--- a/src/editor/model.ts
+++ b/src/editor/model.ts
@@ -237,7 +237,7 @@ export default class EditorModel {
                     }
                 }
             }
-            // not _autoComplete, only there if active part is autocomplete part
+            // not autoComplete, only there if active part is autocomplete part
             if (this.autoComplete) {
                 return this.autoComplete.onPartUpdate(part, pos);
             }