diff --git a/webapp/components/suggestion/suggestion_box.jsx b/webapp/components/suggestion/suggestion_box.jsx
index e1de927b9c..a8ee25db9f 100644
--- a/webapp/components/suggestion/suggestion_box.jsx
+++ b/webapp/components/suggestion/suggestion_box.jsx
@@ -237,7 +237,7 @@ export default class SuggestionBox extends React.Component {
     }
 
     handleKeyDown(e) {
-        if (SuggestionStore.hasSuggestions(this.suggestionId)) {
+        if (this.props.value && SuggestionStore.hasSuggestions(this.suggestionId)) {
             if (e.which === KeyCodes.UP) {
                 GlobalActions.emitSelectPreviousSuggestion(this.suggestionId);
                 e.preventDefault();
@@ -330,12 +330,14 @@ export default class SuggestionBox extends React.Component {
         return (
             <div ref='container'>
                 {textbox}
-                <SuggestionListComponent
-                    suggestionId={this.suggestionId}
-                    location={listStyle}
-                    renderDividers={renderDividers}
-                    onCompleteWord={this.handleCompleteWord}
-                />
+                {this.props.value &&
+                    <SuggestionListComponent
+                        suggestionId={this.suggestionId}
+                        location={listStyle}
+                        renderDividers={renderDividers}
+                        onCompleteWord={this.handleCompleteWord}
+                    />
+                }
             </div>
         );
     }