diff --git a/src/editor/model.js b/src/editor/model.js
index 613be5b4bd..5da3477443 100644
--- a/src/editor/model.js
+++ b/src/editor/model.js
@@ -149,6 +149,9 @@ export default class EditorModel {
 
     reset(serializedParts, caret, inputType) {
         this._parts = serializedParts.map(p => this._partCreator.deserializePart(p));
+        if (!caret) {
+            caret = this.getPositionAtEnd();
+        }
         // close auto complete if open
         // this would happen when clearing the composer after sending
         // a message with the autocomplete still open