diff --git a/src/ComposerHistoryManager.js b/src/ComposerHistoryManager.js
index 5f9cf04e6f..face75ea8a 100644
--- a/src/ComposerHistoryManager.js
+++ b/src/ComposerHistoryManager.js
@@ -44,14 +44,20 @@ export default class ComposerHistoryManager {
 
         // TODO: Performance issues?
         for(; sessionStorage.getItem(`${this.prefix}[${this.lastIndex}]`); this.lastIndex++, this.currentIndex++) {
-            history.push(JSON.parse(sessionStorage.getItem(`${this.prefix}[${this.lastIndex}]`)));
+            this.history.push(
+                Object.assign(
+                    new HistoryItem(),
+                    JSON.parse(sessionStorage.getItem(`${this.prefix}[${this.lastIndex}]`)),
+                ),
+            );
         }
+        this.currentIndex--;
     }
 
     addItem(message: string, format: MessageFormat) {
         const item = new HistoryItem(message, format);
         this.history.push(item);
-        this.currentIndex = this.lastIndex;
+        this.currentIndex = this.lastIndex + 1;
         sessionStorage.setItem(`${this.prefix}[${this.lastIndex++}]`, JSON.stringify(item));
     }
 
diff --git a/src/components/views/rooms/Autocomplete.js b/src/components/views/rooms/Autocomplete.js
index 09b13e8076..5329cde8f2 100644
--- a/src/components/views/rooms/Autocomplete.js
+++ b/src/components/views/rooms/Autocomplete.js
@@ -197,7 +197,6 @@ export default class Autocomplete extends React.Component {
 
     setState(state, func) {
         super.setState(state, func);
-        console.log(state);
     }
 
     render() {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 33f184c446..2a0a62ebf7 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -320,7 +320,6 @@ export default class MessageComposerInput extends React.Component {
                 const selection = RichText.selectionStateToTextOffsets(
                     this.state.editorState.getSelection(),
                     this.state.editorState.getCurrentContent().getBlocksAsArray());
-                console.log(textContent);
                 this.props.onContentChanged(textContent, selection);
             }
         });
@@ -541,7 +540,6 @@ export default class MessageComposerInput extends React.Component {
 
     // tab and shift-tab are mapped to down and up arrow respectively
     onTab = async (e) => {
-        console.log('onTab');
         e.preventDefault(); // we *never* want tab's default to happen, but we do want up/down sometimes
         if (this.autocomplete.state.completionList.length === 0) {
             await this.autocomplete.forceComplete();
@@ -567,7 +565,6 @@ export default class MessageComposerInput extends React.Component {
 
         if (displayedCompletion == null) {
             if (this.state.originalEditorState) {
-                console.log('setting editorState to originalEditorState');
                 let editorState = this.state.originalEditorState;
                 // This is a workaround from https://github.com/facebook/draft-js/issues/458
                 // Due to the way we swap editorStates, Draft does not rerender at times