diff --git a/frontend/src/metabase/query_builder/components/ExpandableString.jsx b/frontend/src/metabase/query_builder/components/ExpandableString.jsx
index 402cd59eef1f3422a7bb4a91406b755a6a62d3c3..60f94b2ea37951c6d2ade1ef27b0d873490d0db4 100644
--- a/frontend/src/metabase/query_builder/components/ExpandableString.jsx
+++ b/frontend/src/metabase/query_builder/components/ExpandableString.jsx
@@ -14,13 +14,14 @@ export default class ExpandableString extends Component {
 
   static defaultProps = {
     length: 140,
-    expanded: false,
   };
 
   componentWillReceiveProps(newProps) {
-    this.setState({
-      expanded: newProps.expanded,
-    });
+    if (newProps.expanded !== undefined) {
+      this.setState({
+        expanded: newProps.expanded,
+      });
+    }
   }
 
   toggleExpansion() {