diff --git a/ui/src/shared/components/FieldList.js b/ui/src/shared/components/FieldList.js
index 4e7181d62..af49ebf95 100644
--- a/ui/src/shared/components/FieldList.js
+++ b/ui/src/shared/components/FieldList.js
@@ -104,7 +104,7 @@ class FieldList extends Component {
   }
 
   renderList() {
-    const {database, measurement, fields} = this.props.query
+    const {database, measurement, fields = []} = this.props.query
     if (!database || !measurement) {
       return (
         <div className="query-builder--list-empty">