diff --git a/app/components/autocomplete/at_mention/index.js b/app/components/autocomplete/at_mention/index.js
index 76ae173a3..030be6fe6 100644
--- a/app/components/autocomplete/at_mention/index.js
+++ b/app/components/autocomplete/at_mention/index.js
@@ -17,7 +17,7 @@ function mapStateToProps(state, ownProps) {
     let postDraft;
     if (ownProps.isSearch) {
         postDraft = state.views.search;
-    } else if (ownProps.rootId.length) {
+    } else if (ownProps.rootId) {
         const threadDraft = state.views.thread.drafts[ownProps.rootId];
         if (threadDraft) {
             postDraft = threadDraft.draft;
diff --git a/app/components/autocomplete/channel_mention/index.js b/app/components/autocomplete/channel_mention/index.js
index 2cb9d267f..bea3809a3 100644
--- a/app/components/autocomplete/channel_mention/index.js
+++ b/app/components/autocomplete/channel_mention/index.js
@@ -18,7 +18,7 @@ function mapStateToProps(state, ownProps) {
     let postDraft;
     if (ownProps.isSearch) {
         postDraft = state.views.search;
-    } else if (ownProps.rootId.length) {
+    } else if (ownProps.rootId) {
         const threadDraft = state.views.thread.drafts[ownProps.rootId];
         if (threadDraft) {
             postDraft = threadDraft.draft;
diff --git a/app/components/autocomplete/emoji_suggestion/index.js b/app/components/autocomplete/emoji_suggestion/index.js
index 002fd8491..847a36264 100644
--- a/app/components/autocomplete/emoji_suggestion/index.js
+++ b/app/components/autocomplete/emoji_suggestion/index.js
@@ -28,7 +28,7 @@ function mapStateToProps(state, ownProps) {
     const emojis = getEmojisByName(state);
 
     let postDraft;
-    if (ownProps.rootId.length) {
+    if (ownProps.rootId) {
         const threadDraft = state.views.thread.drafts[ownProps.rootId];
         if (threadDraft) {
             postDraft = threadDraft.draft;